diff --git a/mailnews/base/resources/content/start.xhtml b/mailnews/base/resources/content/start.xhtml new file mode 100644 index 000000000000..931eb229514f --- /dev/null +++ b/mailnews/base/resources/content/start.xhtml @@ -0,0 +1,78 @@ + + + + + + + + + +%brandDTD; +%regionDTD; +%startDTD; +]> + + + + &startpage.title; + + + +

&headline.label;

+ +
+

&description.label;

+

&features.title;

+ +

&info.title;

+

&info_bugs.label;

+

&info_standalone.label;

+
+ + + diff --git a/mailnews/base/resources/locale/en-US/region.properties b/mailnews/base/resources/locale/en-US/region.properties index 34faecef13ab..40228c3ecab0 100644 --- a/mailnews/base/resources/locale/en-US/region.properties +++ b/mailnews/base/resources/locale/en-US/region.properties @@ -1,7 +1,7 @@ # # messenger.properties # mailnews.js -mailnews.start_page.url=chrome://messenger/locale/start.html +mailnews.start_page.url=chrome://messenger/content/start.xhtml messenger.throbber.url=http://www.mozilla.org/ compose.throbber.url=http://www.mozilla.org/ addressbook.throbber.url=http://www.mozilla.org/ diff --git a/mailnews/base/resources/locale/en-US/start.dtd b/mailnews/base/resources/locale/en-US/start.dtd new file mode 100644 index 000000000000..7bb74aa83ae7 --- /dev/null +++ b/mailnews/base/resources/locale/en-US/start.dtd @@ -0,0 +1,60 @@ + + + +&brandShortName; Mail & Newsgroups!'> + + + + + + + + + + +We welcome bug reports and feature +requests, but please read the release notes and query +Bugzilla first.'> +Thunderbird Mail.'> diff --git a/mailnews/base/resources/locale/en-US/start.html b/mailnews/base/resources/locale/en-US/start.html deleted file mode 100644 index 8271f869acb5..000000000000 --- a/mailnews/base/resources/locale/en-US/start.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Welcome to Mozilla Mail & Newsgroups - - -
- Welcome to Mozilla Mail & Newsgroups - -

We welcome bug reports and feature requests, but please read the - release notes and query Bugzilla first.

-

If you are looking for a stand alone version, see Thunderbird Mail.

-
- - diff --git a/mailnews/jar.mn b/mailnews/jar.mn index 4834fcf06e64..61d1db0130a7 100644 --- a/mailnews/jar.mn +++ b/mailnews/jar.mn @@ -189,6 +189,7 @@ messenger.jar: content/messenger/markByDate.js (base/resources/content/markByDate.js) content/messenger/markByDate.xul (base/resources/content/markByDate.xul) content/messenger/dateFormat.js (base/resources/content/dateFormat.js) + content/messenger/start.xhtml (base/resources/content/start.xhtml) en-US.jar: * locale/en-US/messenger/contents.rdf (base/resources/locale/en-US/contents.rdf) @@ -224,7 +225,7 @@ en-US.jar: locale/en-US/messenger/msgSynchronize.dtd (base/resources/locale/en-US/msgSynchronize.dtd) locale/en-US/messenger/offline.properties (base/resources/locale/en-US/offline.properties) locale/en-US/messenger/junkMail.dtd (base/resources/locale/en-US/junkMail.dtd) - locale/en-US/messenger/start.html (base/resources/locale/en-US/start.html) + locale/en-US/messenger/start.dtd (base/resources/locale/en-US/start.dtd) locale/en-US/messenger/junkMailInfo.dtd (base/resources/locale/en-US/junkMailInfo.dtd) locale/en-US/messenger/SearchDialog.dtd (base/search/resources/locale/en-US/SearchDialog.dtd) locale/en-US/messenger/viewLog.dtd (base/search/resources/locale/en-US/viewLog.dtd) diff --git a/themes/classic/jar.mn b/themes/classic/jar.mn index 4d7eeca3b494..c70b4116d1a4 100644 --- a/themes/classic/jar.mn +++ b/themes/classic/jar.mn @@ -357,6 +357,7 @@ classic.jar: skin/classic/messenger/threadPaneLabels.css (messenger/threadPaneLabels.css) skin/classic/messenger/filterDialog.css (messenger/filterDialog.css) skin/classic/messenger/messageBody.css (messenger/messageBody.css) + skin/classic/messenger/start.css (messenger/start.css) skin/classic/messenger/virtualFolderListDialog.css (messenger/virtualFolderListDialog.css) skin/classic/messenger/icons/attach.gif (messenger/icons/attach.gif) skin/classic/messenger/icons/check.gif (messenger/icons/check.gif) diff --git a/themes/classic/messenger/start.css b/themes/classic/messenger/start.css new file mode 100644 index 000000000000..d5b2c17cf8bb --- /dev/null +++ b/themes/classic/messenger/start.css @@ -0,0 +1,74 @@ +/* ***** 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 + * the Mozilla Organization. + * Portions created by the Initial Developer are Copyright (C) 1998-2002 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Robert Kaiser + * + * 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 GPL or the LGPL. 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 ***** */ + +/* ===== start.css ===================================================== + == Styles used by the mailnews start page. + ======================================================================= */ + +body { + margin: 0; + padding: 0; +} + +h1 { + background-color: -moz-Dialog; + color: -moz-DialogText; + border-bottom: 1px solid ThreeDShadow; + font-size: 1.5em; + font-weight: normal; + padding: 0.25em 0.67em; /* 0.67*1.5=1, so fit with 1em below */ + margin: 0; +} + +div#main { + margin: 0 1em; +} + +p { + margin: 0.5em 0; +} + +h2 { + font-size: 1.2em; + font-weight: bold; + margin: 0.5em 0; +} + +ul { + margin: 0.5em 0; +} + diff --git a/themes/modern/jar.mn b/themes/modern/jar.mn index 444ed25a0c27..5c0a80293dda 100644 --- a/themes/modern/jar.mn +++ b/themes/modern/jar.mn @@ -305,6 +305,7 @@ modern.jar: skin/modern/messenger/mailWindow1.css (messenger/mailWindow1.css) skin/modern/messenger/threadPane.css (messenger/threadPane.css) skin/modern/messenger/primaryToolbar.css (messenger/primaryToolbar.css) + skin/modern/messenger/start.css (messenger/start.css) skin/modern/messenger/addressbook/abResultsPane.css (messenger/addressbook/abResultsPane.css) skin/modern/messenger/addressbook/addressPanes.css (messenger/addressbook/addressPanes.css) skin/modern/messenger/addressbook/cardDialog.css (messenger/addressbook/cardDialog.css) diff --git a/themes/modern/messenger/start.css b/themes/modern/messenger/start.css new file mode 100644 index 000000000000..41664aaea263 --- /dev/null +++ b/themes/modern/messenger/start.css @@ -0,0 +1,74 @@ +/* ***** 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 + * the Mozilla Organization. + * Portions created by the Initial Developer are Copyright (C) 1998-2002 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Robert Kaiser + * + * 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 GPL or the LGPL. 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 ***** */ + +/* ===== start.css ===================================================== + == Styles used by the mailnews start page. + ======================================================================= */ + +body { + margin: 0; + padding: 0; +} + +h1 { + background-color: #C7D0D9; + color: #22262F; + border-bottom: 1px solid #2D3B49; + font-size: 1.5em; + font-weight: normal; + padding: 0.25em 0.67em; /* 0.67*1.5=1, so fit with 1em below */ + margin: 0; +} + +div#main { + margin: 0 1em; +} + +p { + margin: 0.5em 0; +} + +h2 { + font-size: 1.2em; + font-weight: bold; + margin: 0.5em 0; +} + +ul { + margin: 0.5em 0; +} +