Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 04:52:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fork the junk mail dialog so I can add a new tab for a future implementation of black lists. Add some group boxes to the junk mail

Browse Source 
dialog to try to make it look more coherent than the mess it currently is.

Add some CSS for address book cards to make the caption for the group box better blend in with the address book card on win xp.
This commit is contained in:
scott%scott-macgregor.org 2003-06-05 01:26:16 +00:00
parent 446bef339f
commit 3000bb021f
7 changed files with 308 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
mail/base/content/junkMail.xul Normal file
View File

@ -0,0 +1,190 @@
<?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.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corp.
# Portions created by the Initial Developer are Copyright (C) 2002
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Seth Spitzer <sspitzer@netscape.com>
# Dan Mosedale <dmose@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://messenger/skin/junkMail.css" type="text/css"?>
<?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/junkMail.dtd">
<dialog id="junkMail"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:nc="http://home.netscape.com/NC-rdf#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
windowtype="mailnews:junk"
title="&window.title;"
onload="onJunkMailLoad();"
buttons="accept,cancel,help"
ondialogaccept="return onAccept();"
ondialoghelp="return doHelpButton();">
<script type="application/x-javascript" src="chrome://messenger/content/junkMail.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
</stringbundleset>
<hbox align="center">
<label value="&account.label;" accesskey="&account.accesskey;"/>
<menulist oncommand="onServerClick(event);" id="server">
<menupopup datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
sortDirection="ascending" ref="msgaccounts:/">
<template>
<rule nc:IsServer="true" nc:ServerType="nntp">
<!-- no support for news yet -->
</rule>
<rule nc:IsServer="true">
<menuitem uri="..." value="..."
class="folderMenuItem menuitem-iconic"
IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
label="rdf:http://home.netscape.com/NC-rdf#Name"/>
</rule>
</template>
</menupopup>
</menulist>
<spacer flex="1"/>
<button label="&viewLog.label;" accesskey="&viewLog.accesskey;" oncommand="junkLog()"/>
</hbox>
<description width="1">&info1.label;</description>
<vbox id="junkMailControls">
<tabbox>
<tabs id="junkMailTabs">
<tab label="Junk Controls"/>
<tab label="Black Lists"/>
</tabs>
<tabpanels id="junkMailTabsPanels" flex="1">
<!-- JunkMail Tab -->
<vbox index="name" flex="1">
<description width="1">&info2.label;</description>
<groupbox flex="1">
<caption class="tab-caption" label="Detection"/>
<vbox>
<checkbox id="level" oncommand="conditionallyEnableUI(null);" accesskey="&level.accesskey;" label="&level.label;"/>
<vbox align="start">
<checkbox id="useWhiteList" oncommand="conditionallyEnableUI('useWhiteList')" accesskey="&whitelist.accesskey;" label="&whitelist.label;"/>
<hbox>
<spacer width="20px"/>
<menulist id="whiteListAbURI">
<menupopup id="abPopup-menupopup" ref="moz-abdirectory://"
datasources="rdf:addressdirectory"
sortActive="true"
sortDirection="ascending"
sortResource="http://home.netscape.com/NC-rdf#DirTreeNameSort">
<template>
<rule nc:IsWriteable="false"/>
<rule nc:IsMailList="false">
<menuitem uri="..."
label="rdf:http://home.netscape.com/NC-rdf#DirName"
value="rdf:http://home.netscape.com/NC-rdf#DirUri"/>
</rule>
</template>
</menupopup>
</menulist>
</hbox>
</vbox>
</vbox>
</groupbox>
<groupbox flex="1">
<caption class="tab-caption" label="Action"/>
<vbox align="start">
<checkbox id="moveOnSpam" oncommand="conditionallyEnableUI('moveOnSpam')" label="&move.label;"/>
<radiogroup id="moveTargetMode">
<grid class="specialFolderPickerGrid">
<columns>
<column flex="1"/>
<column flex="1"/>
</columns>
<rows>
<row align="center">
<radio id="moveTargetMode0" oncommand="conditionallyEnableUI('moveOnSpam')"
value="0" label="&junkFolderOn.label;"/>
<menulist id="actionTargetAccount" flex="1"/>
</row>
<row align="center">
<radio id="moveTargetMode1" oncommand="conditionallyEnableUI('moveOnSpam')"
value="1" label="&otherFolder.label;"/>
<menulist id="actionTargetFolder"/>
</row>
</rows>
</grid>
</radiogroup>
<hbox align="center">
<spacer width="20px"/>
<checkbox id="purge" oncommand="conditionallyEnableUI('purge')" accesskey="&purge1.accesskey;" label="&purge1.label;"/>
<textbox size="3" id="purgeInterval" />
<label id="purgeLabel" value="&purge2.label;"/>
</hbox>
</vbox>
<vbox align="start">
<checkbox id="manualMark" oncommand="conditionallyEnableUI('manualMark')" label="&manualMark.label;"/>
<hbox>
<spacer width="20px"/>
<radiogroup id="manualMarkMode">
<radio id="manualMarkMode0" value="0" label="&manualMarkModeMove.label;"/>
<radio id="manualMarkMode1" value="1" label="&manualMarkModeDelete.label;"/>
</radiogroup>
</hbox>
</vbox>
</groupbox>
<!-- Real Time Black Lists Tab -->
<vbox index="blackLists" flex="1">
</vbox>
</vbox>
</tabpanels>
</tabbox>
</vbox>
</dialog>

2
mail/base/jar.mn
View File

@ -14,6 +14,7 @@ messenger.jar:
*+ content/messenger/SearchDialog.xul (content/SearchDialog.xul)
*+ content/messenger/subscribe.xul (content/subscribe.xul)
*+ content/messenger/aboutDialog.xul (content/aboutDialog.xul)
*+ content/messenger/junkMail.xul (content/junkMail.xul)
content/messenger/about-thunderbird.png (content/about-thunderbird.png)
classic.jar:
@ -27,6 +28,7 @@ classic.jar:
+ skin/classic/messenger/threadPane.css (skin/threadPane.css)
+ skin/classic/messenger/messageHeader.css (skin/messageHeader.css)
+ skin/classic/messenger/mailWindow1.css (skin/mailWindow1.css)
*+ skin/classic/messenger/junkMail.css (skin/junkMail.css)
+ skin/classic/messenger/icons/new-mail-alert.png (skin/icons/new-mail-alert.png)
skin/classic/messenger/icons/mail-toolbar.png (skin/icons/mail-toolbar.png)
skin/classic/messenger/icons/mail-toolbar-small.png (skin/icons/mail-toolbar-small.png)

46
mail/base/skin/junkMail.css Normal file
View File

@ -0,0 +1,46 @@
#
# The contents of this file are subject to the Netscape 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/NPL/
#
# 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 client code, released
# March 31, 1998.
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998-1999 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
#
#
# ===== junkMail=======.css ==============================================
# == Styles for the junk mail dialog
# ========================================================================
@import url("chrome://messenger/skin/");
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: account manager :::::: */
.specialFolderPickerGrid {
margin-left: 20px;
}
/* XXX: would be nice to find a common place for this XXX */
/* ::::captions in tabs ::::: */
.tab-caption {
-moz-appearance: tabpanels;
}

12
mail/components/addrbook/content/abEditCardDialog.xul
View File

@ -49,7 +49,7 @@
<!-- Name Tab -->
<vbox index="name" flex="1">
<groupbox flex="1">
<caption label="&Name.box;"/>
<caption class="tab-caption" label="&Name.box;"/>
<vbox>
<!-- LOCALIZATION NOTE:
@ -108,7 +108,7 @@
</groupbox>
<groupbox flex="1">
<caption label="&Internet.box;"/>
<caption class="tab-caption" label="&Internet.box;"/>
<vbox>
<hbox>
<spacer flex="1"/>
@ -147,7 +147,7 @@
</groupbox>
<groupbox flex="1">
<caption label="&Phones.box;"/>
<caption class="tab-caption" label="&Phones.box;"/>
<vbox>
<hbox>
<spacer flex="1"/>
@ -191,7 +191,7 @@
<!-- Address Tab -->
<vbox index="address" flex="1">
<groupbox flex="1">
<caption label="&Home.box;"/>
<caption class="tab-caption" label="&Home.box;"/>
<vbox>
<hbox>
<spacer flex="1"/>
@ -242,7 +242,7 @@
</groupbox>
<groupbox flex="1">
<caption label="&Work.box;"/>
<caption class="tab-caption" label="&Work.box;"/>
<vbox>
<hbox>
<spacer flex="1"/>
@ -336,7 +336,7 @@
</vbox>
<groupbox flex="1">
<caption label="&Notes.box;"/>
<caption class="tab-caption" label="&Notes.box;"/>
<vbox>
<textbox id="Notes" multiline="true" rows="20" wrap="virtual" disableforreadonly="true"/>
</vbox>

12
mail/components/addrbook/content/abNewCardDialog.xul
View File

@ -77,7 +77,7 @@
<!-- Name Tab -->
<vbox index="name" flex="1">
<groupbox flex="1">
<caption label="&Name.box;"/>
<caption class="tab-caption" label="&Name.box;"/>
<vbox>
<!-- LOCALIZATION NOTE:
@ -136,7 +136,7 @@
</groupbox>
<groupbox flex="1">
<caption label="&Internet.box;"/>
<caption class="tab-caption" label="&Internet.box;"/>
<vbox>
<hbox>
<spacer flex="1"/>
@ -175,7 +175,7 @@
</groupbox>
<groupbox flex="1">
<caption label="&Phones.box;"/>
<caption class="tab-caption" label="&Phones.box;"/>
<vbox>
<hbox>
<spacer flex="1"/>
@ -219,7 +219,7 @@
<!-- Address Tab -->
<vbox index="address" flex="1">
<groupbox flex="1">
<caption label="&Home.box;"/>
<caption class="tab-caption" label="&Home.box;"/>
<vbox>
<hbox>
<spacer flex="1"/>
@ -270,7 +270,7 @@
</groupbox>
<groupbox flex="1">
<caption label="&Work.box;"/>
<caption class="tab-caption" label="&Work.box;"/>
<vbox>
<hbox>
<spacer flex="1"/>
@ -364,7 +364,7 @@
</vbox>
<groupbox flex="1">
<caption label="&Notes.box;"/>
<caption class="tab-caption" label="&Notes.box;"/>
<vbox>
<textbox id="Notes" multiline="true" rows="20" wrap="virtual" disableforreadonly="true"/>
</vbox>

1
mail/components/addrbook/jar.mn
View File

@ -1,5 +1,6 @@
classic.jar:
+ skin/classic/messenger/addressbook/addressbook.css (skin/addressbook.css)
+ skin/classic/messenger/addressbook/cardDialog.css (skin/cardDialog.css)
messenger.jar:
+ content/messenger/addressbook/abCardViewOverlay.js (content/abCardViewOverlay.js)

57
mail/components/addrbook/skin/cardDialog.css Normal file
View File

@ -0,0 +1,57 @@
/*
* The contents of this file are subject to the Netscape 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/NPL/
*
* 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 client code, released
* March 31, 1998.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998-2001 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Joe Hewitt (hewitt@netscape.com)
*/
/* ===== cardViewOverlay.css ============================================
== Styles for the Address Book Card view.
======================================================================= */
@import url("chrome://messenger/skin/");
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: Card Edit dialog ::::: */
.CardEditWidth {
width: 25em;
}
.CardEditLabel {
padding: 0px;
margin-top: 3px;
}
.alignBoxWithFieldset {
margin-left: 6px;
margin-right: 5px;
}
.stateZipSpacer {
width: 3em;
}
/* XXX: would be nice to find a common place for this XXX ::::captions in tabs ::::: */
.tab-caption {
-moz-appearance: tabpanels;
}