Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 10:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

collapse the privacy pref panel into the advanced panel. We may break it back out into it's own panel in the future but

Browse Source 
for right now there are to many pref panels.

Hide Author/description labels from the extension panel until you first select an extension.
This commit is contained in:
scott%scott-macgregor.org 2003-06-17 02:13:32 +00:00
parent f55576240c
commit c7566992ee
8 changed files with 47 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mail/components/prefwindow/content/pref-advanced.xul
View File

@ -70,6 +70,9 @@
var _elementIDs = [ // labels
"label1TextBox", "label1Color", "label2TextBox", "label2Color", "label3TextBox",
"label3Color", "label4TextBox", "label4Color", "label5TextBox", "label5Color",
// privacy settings
"javascriptAllowMailNews", "networkImageDisableImagesInMailNews", "networkDisableCookieForMailNews",
// return receipts
"alwaysRequest", "receiptFolder", "receiptSend", "notInToCcPref", "outsideDomainPref", "otherCasesPref",
@ -150,6 +153,29 @@
</hbox>
</expander>
<!-- Privacy Settings -->
<expander id="privacySettings" class="prefExpander" label="&privacyTitle.label;" persist="open">
<label class="expanderDescription" value="&privacyFeature.label;" flex="1"/>
<vbox id="contentEnablingBox">
<checkbox id="javascriptAllowMailNews"
label="&enbJsCheckMailNews.label;" accesskey="&enbJsCheckMailNews.accesskey;"
prefstring="javascript.allow.mailnews"/>
<checkbox id="pluginAllowMailNews"
label="&enbPluginCheckMailNews.label;" accesskey="&enbPluginCheckMailNews.accesskey;"
pref="true" preftype="bool" prefstring="mailnews.message_display.allow.plugins"
prefattribute="checked"/>
<checkbox id="networkImageDisableImagesInMailNews"
label="&disableImageInMailNews.label;" accesskey="&disableImageInMailNews.accesskey;"
pref="true" preftype="bool" prefstring="mailnews.message_display.disable_remote_image"
prefinverted="true" prefattribute="checked"/>
<checkbox id="networkDisableCookieForMailNews"
label="&disableCookieForMailNews.label;" accesskey="&disableCookieForMailNews.accesskey;"
preftype="bool" prefinverted="true" prefstring="network.cookie.disableCookieForMailNews"/>
</vbox>
</expander>
<!-- Email Collection (commented out for now until I can figure out why the abs aren't showing up)
<expander id="emailCollection" class="prefExpander" label="&emailCollectiontitle.label;" persist="open">
<label class="expanderDescription" value="&emailCollectiontext.label;" flex="1"/>

5
mail/components/prefwindow/content/pref-extensions.js
View File

@ -64,8 +64,10 @@ function extensionSelect()
var extName = selectedItem.getAttribute("displayName");
var nameField = document.getElementById("extDisplayName");
var author = document.getElementById("extAuthor");
var authorLabel = document.getElementById("authorLabel");
var descText = document.createTextNode(selectedItem.getAttribute("description"));
var description = document.getElementById("extDescription");
var descriptionLabel = document.getElementById("descriptionLabel");
var uninstallButton = document.getElementById("uninstallExtension");
var settingsButton = document.getElementById("extensionSettings");
@ -75,6 +77,8 @@ function extensionSelect()
nameField.setAttribute("value", extName);
author.setAttribute("value", selectedItem.getAttribute("author"));
authorLabel.removeAttribute("collapsed");
var authorURL = selectedItem.getAttribute("authorURL");
if (authorURL != "") {
author.setAttribute("link", selectedItem.getAttribute("authorURL"));
@ -88,6 +92,7 @@ function extensionSelect()
settingsButton.disabled = selectedItem.getAttribute("settingsURL") == "";
description.appendChild(descText);
descriptionLabel.removeAttribute("collapsed");
updateDisableExtButton(selectedItem);
}

6
mail/components/prefwindow/content/pref-extensions.xul
View File

@ -62,7 +62,7 @@
<listbox id="extList" datasources="rdf:chrome"
onselect="extensionSelect();"
ref="urn:mozilla:package:root" rows="7">
ref="urn:mozilla:package:root" rows="10">
<template xmlns:chrome="http://www.mozilla.org/rdf/chrome">
<rule chrome:extension="true">
<listitem uri="..."
@ -84,12 +84,12 @@
<label class="header" id="extDisplayName" value=""/>
<hbox>
<label value="&author.label;"/>
<label id="authorLabel" value="&author.label;" collapsed="true"/>
<label id="extAuthor"/>
</hbox>
<hbox>
<label value="&extDescription.label;"/>
<label id="descriptionLabel" value="&extDescription.label;" collapsed="true"/>
<description id="extDescription" flex="1"/>
</hbox>
</vbox>

76
mail/components/prefwindow/content/pref-privacy.xul
View File

@ -1,76 +0,0 @@
<?xml version="1.0"?>
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is Mozilla Communicator.
#
# The Initial Developer of the Original Code is Netscape Communications Corp.
# Portions created by the Initial Developer are Copyright (C) 2003
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Scott MacGregor <mscott@netscape.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the LGPL or the GPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/prefPanels.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-privacy.dtd">
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="parent.initPanel('chrome://messenger/content/pref-privacy.xul');"
headertitle="&pane.title;">
<script type="application/x-javascript">
<![CDATA[
var _elementIDs = ["javascriptAllowMailNews", "networkImageDisableImagesInMailNews", "networkDisableCookieForMailNews"];
]]>
</script>
<groupbox align="start">
<caption label="&features.label;"/>
<vbox id="contentEnablingBox">
<checkbox id="javascriptAllowMailNews"
label="&enbJsCheckMailNews.label;" accesskey="&enbJsCheckMailNews.accesskey;"
prefstring="javascript.allow.mailnews"/>
<checkbox id="pluginAllowMailNews"
label="&enbPluginCheckMailNews.label;" accesskey="&enbPluginCheckMailNews.accesskey;"
pref="true" preftype="bool" prefstring="mailnews.message_display.allow.plugins"
prefattribute="checked"/>
<checkbox id="networkImageDisableImagesInMailNews"
label="&disableImageInMailNews.label;" accesskey="&disableImageInMailNews.accesskey;"
pref="true" preftype="bool" prefstring="mailnews.message_display.disable_remote_image"
prefinverted="true" prefattribute="checked"/>
<checkbox id="networkDisableCookieForMailNews"
label="&disableCookieForMailNews.label;" accesskey="&disableCookieForMailNews.accesskey;"
preftype="bool" prefinverted="true" prefstring="network.cookie.disableCookieForMailNews"/>
</vbox>
<separator class="thin"/>
</groupbox>
</page>

3
mail/components/prefwindow/content/pref.xul
View File

@ -71,8 +71,7 @@
<button orient="vertical" class="buttonBoxButton" type="radio" group="categories" label="&viewingMessages.label;" url="chrome://messenger/content/pref-viewing_messages.xul"/>
<button id="mailcomposepref" orient="vertical" class="buttonBoxButton" type="radio" group="categories" url="chrome://messenger/content/messengercompose/pref-composing_messages.xul" label="&composingMessages.label;"/>
<button orient="vertical" class="buttonBoxButton" type="radio" group="categories" url="chrome://communicator/content/pref/pref-fonts.xul" label="&fonts.label;"/>
<button orient="vertical" class="buttonBoxButton" type="radio" group="categories" url="chrome://messenger/content/messengercompose/pref-formatting.xul" label="&format.label;"/>
<button orient="vertical" class="buttonBoxButton" type="radio" group="categories" url="chrome://messenger/content/pref-privacy.xul" label="&privacy.label;"/>
<button orient="vertical" class="buttonBoxButton" type="radio" group="categories" url="chrome://messenger/content/messengercompose/pref-formatting.xul" label="&format.label;"/>
<button orient="vertical" class="buttonBoxButton" type="radio" group="categories" url="chrome://messenger/content/pref-advanced.xul" label="&advanced.label;"/>
</vbox>

2
mail/components/prefwindow/jar.mn
View File

@ -6,7 +6,6 @@ messenger.jar:
+ content/messenger/pref-mailnews.js (content/pref-mailnews.js)
*+ content/messenger/pref-advanced.xul (content/pref-advanced.xul)
*+ content/messenger/pref-advanced.js (content/pref-advanced.js)
*+ content/messenger/pref-privacy.xul (content/pref-privacy.xul)
* content/messenger/expanderBindings.xml (content/expanderBindings.xml)
* content/messenger/expanderBindings.css (content/expanderBindings.css)
@ -27,7 +26,6 @@ en-US.jar:
+ locale/en-US/messenger/mailPrefsOverlay.dtd (locale/mailPrefsOverlay.dtd)
+ locale/en-US/messenger/pref-viewing_messages.dtd (locale/pref-viewing_messages.dtd)
+ locale/en-US/messenger/AccountManager.dtd (locale/AccountManager.dtd)
locale/en-US/messenger/pref-privacy.dtd (locale/pref-privacy.dtd)
+ locale/en-US/messenger/pref-advanced.dtd (locale/pref-advanced.dtd)
+ locale/en-US/communicator/pref/pref-themes.dtd (locale/pref-themes.dtd)
+ locale/en-US/communicator/pref/pref-extensions.dtd (locale/pref-extensions.dtd)

12
mail/components/prefwindow/locale/pref-advanced.dtd
View File

@ -5,6 +5,18 @@
<!ENTITY restoreDefaults.label "Restore Defaults">
<!ENTITY restoreDefaults.accesskey "R">
<!-- Privacy Settings -->
<!ENTITY privacyTitle.label "Privacy">
<!ENTITY privacyFeature.label "Allow the following features:">
<!ENTITY enbJsCheckMailNews.label "JavaScript">
<!ENTITY enbJsCheckMailNews.accesskey "s">
<!ENTITY enbPluginCheckMailNews.label "Plugins">
<!ENTITY enbPluginCheckMailNews.accesskey "p">
<!ENTITY disableImageInMailNews.label "Loading of remote images">
<!ENTITY disableImageInMailNews.accesskey "L">
<!ENTITY disableCookieForMailNews.label "Cookies">
<!ENTITY disableCookieForMailNews.accesskey "C">
<!ENTITY returnReceiptsDescription.label "Configure Return Receipts.">
<!--LOCALIZATION NOTE : FILE The Proxies preferences dialog -->

10
mail/components/prefwindow/locale/pref-privacy.dtd
View File

@ -1,10 +0,0 @@
<!ENTITY pane.title "Privacy">
<!ENTITY features.label "Allow the following features:">
<!ENTITY enbJsCheckMailNews.label "JavaScript">
<!ENTITY enbJsCheckMailNews.accesskey "s">
<!ENTITY enbPluginCheckMailNews.label "Plugins">
<!ENTITY enbPluginCheckMailNews.accesskey "p">
<!ENTITY disableImageInMailNews.label "Loading of remote images">
<!ENTITY disableImageInMailNews.accesskey "L">
<!ENTITY disableCookieForMailNews.label "Cookies">
<!ENTITY disableCookieForMailNews.accesskey "C">