Bug 66570 - improve "Welcome to mozilla mail & news" page, r=Neil,sr=bienvenu

2024-11-25 13:51:41 +00:00 · 2004-11-29 15:40:56 +00:00 · 2004-11-29 15:40:56 +00:00 · 619fa995d8
commit 619fa995d8
parent cb22d7bf0c
9 changed files with 291 additions and 19 deletions
--- a/mailnews/base/resources/content/start.xhtml
+++ b/mailnews/base/resources/content/start.xhtml
@ -0,0 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ***** 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 application suite mailnews start page.
   -
   - The Initial Developer of the Original Code is
   - Robert Kaiser.
   - Portions created by the Initial Developer are Copyright (C) 2004
   - the Initial Developer. All Rights Reserved.
   -
   - Contributor(s):
   -   Robert Kaiser <kairo@kairo.at>
   -
   - 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/start.css" type="text/css"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 <!ENTITY % regionDTD SYSTEM "chrome://global-region/locale/region.dtd" >
 <!ENTITY % startDTD SYSTEM "chrome://messenger/locale/start.dtd" >
 %brandDTD;
 %regionDTD;
 %startDTD;
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <title>&startpage.title;</title>
 </head>
 <body>
 <h1>&headline.label;</h1>
 <div id="main">
 <p>&description.label;</p>
 <h2>&features.title;</h2>
 <ul>
  <li>&feat_multiacc.label;</li>
  <li>&feat_junk.label;</li>
  <li>&feat_filters.label;</li>
  <li>&feat_htmlmsg.label;</li>
  <li>&feat_abook.label;</li>
  <li>&feat_labels.label;</li>
  <li>&feat_integration.label;</li>
 </ul>
 <h2>&info.title;</h2>
 <p>&info_bugs.label;</p>
 <p>&info_standalone.label;</p>
 </div>
 </body>
 </html>
--- 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/
--- a/mailnews/base/resources/locale/en-US/start.dtd
+++ b/mailnews/base/resources/locale/en-US/start.dtd
@ -0,0 +1,60 @@
 <!-- ***** 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 application suite mailnews start page.
   -
   - The Initial Developer of the Original Code is
   - Robert Kaiser.
   - Portions created by the Initial Developer are Copyright (C) 2004
   - the Initial Developer. All Rights Reserved.
   -
   - Contributor(s):
   -   Robert Kaiser <kairo@kairo.at>
   -
   - 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 ***** -->
 <!ENTITY startpage.title "Welcome to &brandShortName; Mail &amp; Newsgroups">
 <!ENTITY headline.label
 'Welcome to <a href="&vendorURL;">&brandShortName;</a> Mail &amp; Newsgroups!'>
 <!ENTITY description.label
 "&brandShortName; Mail &amp; Newsgroups is a powerful open-source mail and news
 client, supporting advanced junk mail detection and other useful features.">
 <!ENTITY features.title "Features">
 <!ENTITY feat_multiacc.label "Support for multiple accounts">
 <!ENTITY feat_junk.label "Junk Mail detection">
 <!ENTITY feat_filters.label "Message Filters">
 <!ENTITY feat_htmlmsg.label "HTML message support">
 <!ENTITY feat_abook.label "Address Book">
 <!ENTITY feat_labels.label "Customizable Labels and Mail Views">
 <!ENTITY feat_integration.label
 "Tight integration with the &brandShortName; application suite">
 <!ENTITY info.title "More Information">
 <!ENTITY info_bugs.label
 '<a href="http://www.mozilla.org/mailnews/">We</a> welcome bug reports and feature
 requests, but please read the <a href="&releaseURL;">release notes</a> and query
 <a href="http://bugzilla.mozilla.org/query.cgi">Bugzilla</a> first.'>
 <!ENTITY info_standalone.label
 'If you are looking for a stand alone version, see
 <a href="http://www.mozilla.org/products/thunderbird/">Thunderbird Mail</a>.'>
--- a/mailnews/base/resources/locale/en-US/start.html
+++ b/mailnews/base/resources/locale/en-US/start.html
@ -1,17 +0,0 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
 	"http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html lang="en-US">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  <title>Welcome to Mozilla Mail &amp; Newsgroups</title>
 </head>
 <body>
 <div style="text-align: center">
  <strong>Welcome to <a href="http://www.mozilla.org">Mozilla</a> Mail &amp; Newsgroups</strong>
  <p><a href="http://www.mozilla.org/mailnews/">We</a> welcome bug reports and feature requests, but please read the
     <a href="http://www.mozilla.org/releases/">release notes</a> and query <a href="http://bugzilla.mozilla.org/query.cgi">Bugzilla</a> first.</p>
  <p>If you are looking for a stand alone version, see <a href="http://www.mozilla.org/products/thunderbird/">Thunderbird Mail</a>.</p>
 </div>
 </body>
 </html>
--- 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)
--- 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)
--- a/themes/classic/messenger/start.css
+++ 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 <KaiRo@KaiRo.at>
 *
 * 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;
 }
--- 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)
--- a/themes/modern/messenger/start.css
+++ 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 <KaiRo@KaiRo.at>
 *
 * 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;
 }