bug 276655

Updating the About Sunbird dialog, and adding the credits
r=mostafah

calendar/resources/jar.mn

@@ -97,6 +97,7 @@ calendar.jar:
     content/calendar/pref/timezonePrefs.xul (content/pref/timezonePrefs.xul)
     content/calendar/pref/wsm.js (content/pref/wsm.js)
 *   content/calendar/pref/nsPrefWindow.js (content/pref/nsPrefWindow.js)
+*   locale/en-US/calendar/aboutDialog.dtd (locale/en-US/aboutDialog.dtd)
     locale/en-US/calendar/calendar.dtd (locale/en-US/calendar.dtd)
     locale/en-US/calendar/calendar.properties (locale/en-US/calendar.properties)
     locale/en-US/calendar/categories.properties  (locale/en-US/categories.properties) 

calendar/resources/locale/en-US/aboutDialog.dtd

@@ -0,0 +1,76 @@
+<!-- -*- Mode: HTML; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+   - ***** 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 Firefox about dialog.
+   -
+   - The Initial Developer of the Original Code is 
+   - Blake Ross (blaker@netscape.com).
+   - Portions created by the Initial Developer are Copyright (C) 2002
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s): Matthew Willis <mattwillis@gmail.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 ***** -->
+
+<!ENTITY aboutDialog.title      "About &brandFullName;">
+<!ENTITY copyright              "Credits">
+<!ENTITY aboutLink              "&lt; About &brandFullName;">
+<!ENTITY aboutVersion           "version">
+<!ENTITY copyrightText          "&#169;1998-2005 Contributors. All rights
+                                 reserved. Mozilla Sunbird, Sunbird, and the
+                                 Sunbird logos are trademarks of the Mozilla
+                                 Foundation. All rights reserved.">
+
+<!ENTITY brandMotto       "it's about time">
+<!ENTITY credit.leads     "Engineering Leads">
+<!ENTITY credit.core      "Core Development Team">
+<!ENTITY credit.gecko     "Gecko Layout Engine">
+<!ENTITY credit.thanks    "Special Thanks To">
+
+<!-- localization credits look like this: -->
+<!--
+<!ENTITY credit.translation
+  "<h3>Translators</h3><ul><li>Name Here</li></ul>">
+-->
+<!ENTITY credit.translation "">
+
+<!ENTITY credit.visuals     "Visual Design Coordinator">
+<!ENTITY credit.theme       "Theme Design">
+<!ENTITY credit.brand       "Brand Identity">
+<!ENTITY credit.web         "Web Design">
+<!ENTITY credit.update      "Mozilla Update">
+<!ENTITY credit.qalead      "Quality Assurance Lead">
+<!ENTITY credit.qa          "Quality Assurance">
+<!ENTITY credit.build       "Build and Release">
+<!ENTITY credit.infra       "Infrastructure Support">
+<!ENTITY credit.support     "Support Resources">
+<!ENTITY credit.manage      "Project Management">
+<!ENTITY credit.marketleads "Marketing Leads">
+<!ENTITY credit.market      "Marketing">
+<!ENTITY credit.creators    "Created By">
+<!ENTITY credit.memory      "In Fond Memory Of">
+<!ENTITY credit.powered     "Powered by">
+

calendar/sunbird/base/content/aboutDialog.css

@@ -1,18 +1,65 @@
+/*
+# -*- Mode: Java; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+# ***** 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 Firefox about dialog.
+#
+# The Initial Developer of the Original Code is
+# Kevin Gerich and Stephen Horlander.
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):Matthew Willis <mattwillis@gmail.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 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 *****
+*/
+
  #aboutDialog {
    padding: 0px 0px 10px 0px;
  }
 
  #clientBox {
+   background-color: #FFFFFF;
    background-image: url("chrome://calendar/content/about-sunbird.png");
    background-repeat: no-repeat;
-   background-color: #FFFFFF;
    padding-top: 203px;
    color: #000000;
  }
 
- #brandName {
+ #version {
-   font-weight: bold; font-size: larger;
+   font-weight: bold;
- } 
+   color: #909090;
+   margin: 1em 0px 10px 17px;
+ }
+
+ #copyright {
+   color: #000000;
+   margin: 0px 16px 3px 16px;
+   text-align: justify;
+ }
 
  #detailsBox {
    padding: 8px 10px 10px 8px;
@@ -25,18 +72,15 @@
    padding: 1px 0px 1px 3px;
    -moz-appearance: none;
    overflow: hidden;
-
 #ifdef XP_MACOSX
    height: 3.8em;
 #else
    height: 2.4em;
 #endif
-
    border: none;
  }
 
- #groove {
+ #creditsBox {
-   margin-top: 0px;
  }
 
  #creditsIframe {
@@ -44,14 +88,8 @@
    -moz-user-select: none;
  }
 
- #version {
+ #groove {
-   font-weight: bold;
+   margin-top: 0px;
-   color: #909090;
-   margin: 1em 0px 10px 17px;
- }
-
- #copyright {
-   margin: 0px 0px 3px 16px;
  }
 
  button[dlgtype="extra2"] {

calendar/sunbird/base/content/aboutDialog.js

@@ -0,0 +1,81 @@
+/* -*- Mode: Java; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** 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 Firefox about dialog.
+ *
+ * The Initial Developer of the Original Code is
+ * Blake Ross (blaker@netscape.com).
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Matthew Willis <mattwillis@gmail.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 ***** */
+
+function init(aEvent) 
+{
+  if (aEvent.target != document)
+    return;
+  var userAgentField = document.getElementById("userAgent");
+  userAgentField.value = navigator.userAgent;
+
+  var button = document.documentElement.getButton("extra2");
+  button.setAttribute("label", document.documentElement.getAttribute("creditslabel"));
+  gSelectedPage = 0;
+  button.addEventListener("command", switchPage, false);
+
+  document.documentElement.getButton("accept").focus();
+}
+
+function uninit(aEvent)
+{
+  if (aEvent.target != document)
+    return;
+  var iframe = document.getElementById("creditsIframe");
+  iframe.setAttribute("src", "");
+}
+
+function switchPage(aEvent)
+{
+  var button = aEvent.target;
+  if (button.localName != "button")
+    return;
+
+  var iframe = document.getElementById("creditsIframe");
+  if (gSelectedPage == 0) { 
+    iframe.setAttribute("src", "chrome://calendar/content/credits.xhtml");
+    button.setAttribute("label", document.documentElement.getAttribute("aboutlabel"));
+    gSelectedPage = 1;
+  }
+  else {
+    iframe.setAttribute("src", ""); 
+    button.setAttribute("label", document.documentElement.getAttribute("creditslabel"));
+    gSelectedPage = 0;
+  }
+  var modes = document.getElementById("modes");
+  modes.setAttribute("selectedIndex", gSelectedPage);
+}
+

calendar/sunbird/base/content/aboutDialog.xul

@@ -1,5 +1,6 @@
-<?xml version="1.0"?> <!-- -*- Mode: HTML -*- --> 
+<?xml version="1.0"?>
 <!--
+# -*- Mode: Java; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
@@ -13,7 +14,7 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The Original Code is Mozilla Firebird about dialog.
+# The Original Code is Mozilla Firefox about dialog.
 #
 # The Initial Developer of the Original Code is
 # Blake Ross (blaker@netscape.com).
@@ -34,7 +35,7 @@
 # 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 ***** 
+# ***** END LICENSE BLOCK *****
 -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
@@ -43,39 +44,42 @@
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
-<!ENTITY % calendarMenuOverlayDTD SYSTEM "chrome://calendar/locale/menuOverlay.dtd" >
+<!ENTITY % aboutDialogDTD SYSTEM "chrome://calendar/locale/aboutDialog.dtd" >
-%calendarMenuOverlayDTD;
+%aboutDialogDTD;
 ]>
 
 <dialog xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="aboutDialog"
-        buttons="accept"
+        buttons="accept,extra2"
-        onload="onLoad();"
+        onload="init(event);" onunload="uninit(event);"
-        title="&aboutCmd.label;"
+        title="&aboutDialog.title;" creditslabel="&copyright;" aboutlabel="&aboutLink;"
         style="width: 299px;height: 435px;">
 
-    <script type="application/x-javascript">
+  <script type="application/x-javascript">
-      <![CDATA[
+    <![CDATA[
-        function onLoad() {
+      function onLoad() {
-          var userAgentField = document.getElementById("userAgent");
+        var userAgentField = document.getElementById("userAgent");
-          userAgentField.value = navigator.userAgent;
+        userAgentField.value = navigator.userAgent;
-        }
+      }
-      ]]>
+    ]]>
-    </script>
+  </script>
 
-   <deck id="modes" flex="1">
+  <script type="application/x-javascript" src="chrome://calendar/content/aboutDialog.js"/>
+
+  <deck id="modes" flex="1">
     <vbox flex="1" id="clientBox">
-#expand <label id="version" value="version &version; __MOZ_APP_VERSION__"/>
+#expand <label id="version" value="&aboutVersion; &version; __APP_VERSION__"/>
-#      <description id="copyright">&copyrightText;</description>
+      <description id="copyright">&copyrightText;</description>
       <vbox id="detailsBox" align="center" flex="1">
         <spacer flex="1"/>
         <textbox flex="1" id="userAgent" multiline="true" readonly="true" cols="60"/>
       </vbox>
     </vbox>
-#    <vbox flex="1" id="creditsBox">
+    <vbox flex="1" id="creditsBox">
-#      <html:iframe style="border: 0px;" id="creditsIframe" src="chrome://calendar/content/credits.xhtml" flex="1"/>
+      <html:iframe style="border: 0px;" id="creditsIframe" 
-#    </vbox>
+                   src="chrome://calendar/content/credits.xhtml" flex="1"/>
+    </vbox>
   </deck>
   <separator class="groove" id="groove"/>
 </dialog>

calendar/sunbird/base/content/credits.xhtml

@@ -0,0 +1,294 @@
+<!-- -*- Mode: HTML; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+# ***** 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 Firefox Credits.
+#
+# The Initial Developer of the Original Code is Ben Goodger.
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Ben Goodger <ben@mozilla.org>
+#   David Baron <dbaron@mozilla.org>
+#
+# 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 *****
+-->
+<!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">
+    %brandDTD;
+    <!ENTITY % creditsDTD SYSTEM "chrome://calendar/locale/aboutDialog.dtd">
+    %creditsDTD;
+    <!ENTITY % licenseDTD SYSTEM "chrome://global/locale/license.dtd">
+    %licenseDTD;
+  ]
+>
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>&brandFullName; Credits</title>
+
+    <style>
+      html {
+        background-color: white;
+      }
+
+      * {
+        cursor: default;
+        -moz-user-select: none;
+      }
+
+      #titleBox {
+        position: fixed;
+        left: 0px;
+        top: 0px;
+        right: 0px;
+        bottom: auto;
+        z-index: 999;
+      }
+
+      #footerBox {
+        position: fixed;
+        left: 0px;
+        top: auto;
+        right: 0px;
+        bottom: 0px;
+        z-index: 999;
+      }
+
+      #creditsBox {
+        position: absolute;
+        left: 0px;
+        top: 0px;
+        overflow: hidden;
+        z-index: 1;
+        height: 380px;
+        width: 279px;
+        margin-left: 10px;
+        margin-right: 10px;
+        font-family: Arial, sans-serif;
+        font-size: small;
+      }
+
+      h3 {
+        font-weight: bold;
+        font-size: small;
+        text-align: center;
+        margin: 15px 0px 5px 0px;
+      }
+
+      .creditsGroup {
+        margin-bottom: 1px;
+        text-align: center;
+      }
+
+      .footnote {
+        font-size: x-small;
+        text-align: justify;
+      }
+
+      h2.title {
+        margin-top: 200px;
+        margin-bottom: 200px;
+        text-align: center;
+      }
+
+      .motto {
+        margin-top: 2px;
+        font-style: italic;
+        font-size: small;
+        font-weight: normal;
+        padding-left: 2em;
+      }
+
+      #gecko {
+        margin-top:    100px;
+        margin-bottom: 100px;
+        font-size: medium;
+      }
+
+      a {
+        color: blue;
+        text-decoration: underline;
+      }
+
+      ul {
+        margin-top: 0px;
+        margin-left: 0px;
+        padding-left: 0px;
+      }
+
+      li {
+        list-style-type: none;
+      }
+
+      .center {
+        text-align: center;
+      }
+    </style>
+
+    <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"></script>
+    <script type="application/x-javascript">
+    <![CDATA[
+
+      var gCreditsInterval = -1;
+
+      function uninit()
+      {
+        if (gCreditsInterval > -1)
+          clearInterval(gCreditsInterval);
+      }
+
+      function init()
+      {
+        var cb = document.getElementById("creditsBox");
+        cb.scrollTop = 0;
+        setTimeout(runCredits, 3000);
+      }
+
+      function runCredits()
+      {
+        gCreditsInterval = setInterval("creditsCallback()", 25);
+      }
+
+      function creditsCallback()
+      {
+        var cb = document.getElementById("creditsBox");
+        var newtop = cb.scrollTop + 1;
+        cb.scrollTop = newtop;
+        if (cb.scrollTop != newtop) {
+          // we're at the bottom
+          clearInterval(gCreditsInterval);
+          setTimeout(function() { cb.scrollTop = 0 }, 3000);
+        }
+      }
+
+    ]]>
+    </script>
+  </head>
+  <body onload="init();" onunload="uninit();">
+    <div id="titleBox">
+      <img src="chrome://calendar/content/aboutCredits.png" />
+    </div>
+
+    <div id="creditsBox">
+        <h2 class="title">&brandFullName;&trade;
+          <div class="motto">&brandMotto;</div>
+        </h2>
+
+        <div class="creditsGroup">
+          <h3>&credit.manage;</h3>
+          <ul>
+            <li>Mostafa Hosseini</li>
+          </ul>
+        </div>
+
+        <div class="creditsGroup">
+          <h3>&credit.core;</h3>
+          <ul>
+            <li>gekacheka</li>
+            <li>Mostafa Hosseini</li>
+            <li>Dan Mosedale</li>
+            <li>Stuart Parmenter</li>
+            <li>Mike Shaver</li>
+            <li>Michiel van Leeuwen</li>
+            <li>Vladimir Vukicevic</li>
+            <li>Matthew Willis</li>
+          </ul>
+
+        <div class="creditsGroup">
+          <h3>&credit.theme;</h3>
+          <ul>
+            <li>Mark Carson</li>
+            <li>Matthew Willis</li>
+          </ul>
+        </div>
+
+        <div class="creditsGroup">
+          <h3>&credit.web;</h3>
+          <ul>
+            <li>Simon Paquet</li>
+          </ul>
+        </div>
+
+          &credit.translation;
+        </div>
+
+        <!-- organizational supporters -->
+        <div class="creditsGroup">
+          <h3>&credit.thanks;</h3>
+          <ul>
+            <li>Axentra Corporation</li>
+            <li>Oracle Corporation</li>
+            <li>MozillaZine Community</li>
+            <li>MozillaZine</li>
+            <li>MozDev</li>
+          </ul>
+        </div>
+
+        <p id="gecko" class="center">&credit.powered; Gecko&trade;</p>
+
+        <p class="footnote">
+          &brandFullName;&trade; &license.part0; copyright &copy;1998-2005 &license.part1;
+          <a href="" link="about:credits" onclick="visitLink(event);">&license.contrib;</a>,
+          &license.part2;
+          <a href="" link="chrome://global/content/MPL-1.1.html" onclick="visitLink(event);">Mozilla Public License</a>
+          &license.and;
+          <a href="" link="chrome://global/content/NPL-1.1.html" onclick="visitLink(event);">Netscape Public License</a>&license.part3;</p>
+
+        <p class="footnote">
+          Portions of this software are Copyright &copy;1994 The Regents of the
+          University of California. All Rights Reserved.</p>
+
+        <p class="footnote">
+          This software may contain portions that are Copyright &copy;1998-2004
+          SupportSoft, Inc. All Rights Reserved.</p>
+
+        <p class="footnote">
+          Mozilla Sunbird&trade; and the Sunbird logo are trademarks of the Mozilla
+          Foundation. You are not granted rights or licenses to the trademarks
+          of the Mozilla Foundation or any party, including without limitation the
+          Sunbird name or logo.</p>
+
+        <p class="footnote">
+          U.S. GOVERNMENT END USERS. The Software is a &ldquo;commercial item,&rdquo;
+          as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
+          &ldquo;commercial computer software&rdquo; and &ldquo;commercial computer software
+          documentation,&rdquo; as such terms are used in 48 C.F.R. 12.212 (Sept. 1995).
+          Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through
+          227.7202-4 (June 1995), all U.S. Government End Users acquire the
+          Software with only those rights set forth herein.</p>
+
+    </div>
+
+    <div id="footerBox">
+      <img src="chrome://calendar/content/aboutFooter.png" />
+    </div>
+  </body>
+</html>
+