Bug 467674 - Document new UI from |Bug 467174 - [RFE] Add preferences options for popup and missing plugin infobars|. r=stefanh (who thanks ajschult for grammar/wording assistance during the review).
authorJens Hatlak <jh@junetz.de>
Thu, 08 Jan 2009 00:03:36 +0100
changeset 1575 8a9ba51d53325af8ed97a9966a3187a05789e4d8
parent 1574 9c788dc9e472056faeb2a0de6ffee80c69097e4f
child 1576 2421d18c3a24464c874862a4dd3e9566501c9bd1
push idunknown
push userunknown
push dateunknown
reviewersstefanh
bugs467674, 467174
Bug 467674 - Document new UI from |Bug 467174 - [RFE] Add preferences options for popup and missing plugin infobars|. r=stefanh (who thanks ajschult for grammar/wording assistance during the review).
suite/common/pref/preferences.xul
suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
suite/locales/en-US/chrome/common/help/cs_priv_prefs_popup.xhtml
--- a/suite/common/pref/preferences.xul
+++ b/suite/common/pref/preferences.xul
@@ -168,17 +168,17 @@
           <treeitem id="imagesItem"
                     label="&images.label;"
                     prefpane="images_pane"
                     helpTopic="images_prefs"
                     url="chrome://communicator/content/pref/pref-images.xul"/>
           <treeitem id="popupsItem"
                     label="&popups.label;"
                     prefpane="popups_pane"
-                    helpTopic="pop_up_blocking"
+                    helpTopic="pop_up_blocking_prefs"
                     url="chrome://communicator/content/pref/pref-popups.xul"/>
           <treeitem id="passwordsItem"
                     label="&passwords.label;"
                     prefpane="passwords_pane"
                     url="chrome://communicator/content/pref/pref-passwords.xul"
                     helpTopic="passwords_prefs"/>
           <treeitem id="masterpassItem"
                     label="&masterpass.label;"
--- a/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -113,16 +113,27 @@
   </li>
   <li><strong>Enable Plugins for</strong>: Check this checkbox to control how
     plugins are used:
     <ul>
       <li><strong>Mail &amp; Newsgroups</strong>: Allows plugins to be used in
         Mail &amp; Newsgroups.</li>
     </ul>
   </li>
+  <li><strong>When additional plugins are required</strong>: Check this
+    checkbox if you want to be informed whenever a website requires additional
+    plugins:
+    <ul>
+      <li><strong>Display a notification bar at the top of the content
+        area</strong>: When a website requires a plugin which is not installed,
+        a notification bar will be displayed above the website content area.
+        From the bar you will be able to download and install the missing
+        plugin.</li>
+    </ul>
+  </li>
 </ul>
 
 <p>For more information about plugins, see
   <a href="nav_help.xhtml#plugins_and_downloads">Plugins and Downloads</a>.
 </p>
 
 <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 
--- a/suite/locales/en-US/chrome/common/help/cs_priv_prefs_popup.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_priv_prefs_popup.xhtml
@@ -61,17 +61,17 @@
 
 <p>The next section describes how to control popups through preferences and
   through the popup control icon.</p>
 
 <h2 id="privacy_and_security_preferences_popup_windows">Privacy &amp; Security
   Preferences - Popup Windows</h2>
 
 <p>This section describes how to use the Popup Windows preferences panel. If
- you&apos;re not already viewing it, follow these steps:</p>
+  you&apos;re not already viewing it, follow these steps:</p>
 
 <ol>
   <li>Open the
     <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Privacy &amp; Security Preferences category, click Popup
     Windows. (If no subcategories are visible, double-click Privacy &amp;
     Security to expand the list.)</li>
@@ -113,24 +113,32 @@
     <img src="chrome://navigator/skin/icons/popup-blocked.png" alt="Popup control
     icon"/> in the browser status bar to indicate that a popup is blocked.
 
     <p><strong>Note</strong>: After the popup control icon
       <img src="chrome://navigator/skin/icons/popup-blocked.png" alt="Popup
       control icon"/> appears, it remains visible until you visit another
       website.</p>
   </li>
+  <li><strong>Display a notification bar at the top of the content area</strong>:
+    Select this to display a notification bar above the website content area
+    whenever a popup is blocked. In the bar, use the Preferences button to choose
+    how to handle popups from that website.
+  </li>
 </ul>
 
-<p><strong>Using the popup control icon to add allowed websites</strong>: You
-  can use the popup control icon to quickly add a website to the list of
-  allowed websites. Click the icon
+<p><strong>Using the popup control icon or notification bar to add allowed
+  websites</strong>: You can use the popup control icon or notification bar to
+  quickly add a website to the list of allowed websites. Click the icon
   <img src="chrome://navigator/skin/icons/popup-blocked.png" alt="Popup control
   icon"/> to open the list of allowed websites. The current website is
-  already filled in. Click Add and then click OK to confirm your addition.</p>
+  already filled in. Click Add and then click OK to confirm your addition.
+  Similarly you can use the notification bar to allow popups from the current
+  website or open the list of allowed websites through Manage Popups. Just
+  click the Preferences button at the right end of the notification bar.</p>
 
 <p><strong>Note</strong>: Blocking popups may not always work and may interfere
   with some websites. For more information about blocking popups, see
   <a href="#controlling_popups">Controlling Popups</a>.</p>
 
 <p>&copyright.string;</p>
 
 </body>