Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 579547 - New About window for Firefox 4 r=gavin ui-r=belzner a=blocking

Browse Source
This commit is contained in:
Margaret Leibovic 2010-09-14 16:17:59 -07:00
parent ee45914359
commit 302165dbb1
34 changed files with 190 additions and 869 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
browser/base/content/aboutDialog.css
View File

@ -3,104 +3,82 @@
-moz-padding-end: 0;
padding-bottom: 10px;
-moz-padding-start: 0;
width: 299px;
}
#modes {
min-height: 400px;
width: 600px;
}
#clientBox {
/* Add a min-width equal to chrome://branding/content/about.png's
* width, to maintain the dialog layout on OS X where the dialog is
* align="end" to right-align the button.
*/
min-width: 300px;
background-image: url("chrome://branding/content/about.png");
background-color: #F7F7F7;
color: #222222;
}
#leftBox {
background-image: url("chrome://branding/content/about-logo.png");
background-repeat: no-repeat;
background-color: #FFFFFF;
padding-top: 203px;
color: #000000;
/* min-width and min-height create room for the logo */
min-width: 210px;
min-height: 210px;
margin-top:20px;
-moz-margin-start: 30px;
}
#brandName {
font-weight: bold; font-size: larger;
#rightBox {
background-image: url("chrome://branding/content/about-wordmark.png");
background-repeat: no-repeat;
/* padding-top creates room for the wordmark */
padding-top: 38px;
margin-top:20px;
-moz-margin-end: 30px;
-moz-margin-start: 30px;
}
#userAgent {
direction: ltr;
margin-top: 10px;
-moz-margin-end: 13px;
margin-bottom: 0;
-moz-margin-start: 13px;
background-color: #FFFFFF;
color: #000000;
padding-top: 1px;
-moz-padding-end: 1px;
padding-bottom: 1px;
-moz-padding-start: 3px;
-moz-appearance: none;
overflow: hidden;
border: 0;
#rightBox:-moz-locale-dir(rtl) {
background-position: 100% 0;
}
#groove {
margin-top: 0;
}
#creditsIframe {
cursor: default;
-moz-user-select: none;
border: 0;
#bottomBox {
padding: 15px 10px 0;
}
#version {
font-weight: bold;
color: #909090;
margin-top: 1em;
-moz-margin-end: 0;
margin-bottom: 10px;
-moz-margin-start: 17px;
margin-top: 5px;
}
#distribution {
font-weight: bold;
color: #909090;
display: none;
margin-top: 0;
-moz-margin-end: 0;
margin-bottom: 0;
-moz-margin-start: 17px;
#released {
color: #666666;
}
#distribution,
#distributionId {
font-weight: bold;
color: #909090;
display: none;
margin-top: 0;
-moz-margin-end: 0;
margin-bottom: 0;
}
#checkForUpdatesButton,
.text-blurb {
margin-bottom: 10px;
-moz-margin-start: 17px;
}
#copyright {
margin-top: 0;
-moz-margin-end: 16px;
margin-bottom: 3px;
-moz-margin-start: 16px;
}
button[dlgtype="extra2"] {
-moz-margin-start: 13px;
}
button[dlgtype="accept"] {
-moz-margin-end: 13px;
-moz-margin-start: 0;
-moz-padding-start: 0;
}
.version-label,
.trademark-label,
.text-link,
.text-link:focus {
margin: 0px;
padding: 0px;
border: 0px;
}
.bottom-link,
.bottom-link:focus {
text-align: center;
margin: 0 40px;
}
#trademark {
font-size: xx-small;
text-align: center;
color: #999999;
margin-top: 10px;
}

74
browser/base/content/aboutDialog.js
View File

@ -20,6 +20,7 @@
#
# Contributor(s):
# Ehsan Akhgari <ehsan.akhgari@gmail.com>
# Margaret Leibovic <margaret.leibovic@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
@ -35,21 +36,19 @@
#
# ***** END LICENSE BLOCK ***** -->
var gSelectedPage = 0;
// Services = object with smart getters for common XPCOM services
Components.utils.import("resource://gre/modules/Services.jsm");
function init(aEvent)
{
if (aEvent.target != document)
return;
var prefs = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
try {
var distroId = prefs.getCharPref("distribution.id");
var distroId = Services.prefs.getCharPref("distribution.id");
if (distroId) {
var distroVersion = prefs.getCharPref("distribution.version");
var distroAbout = prefs.getComplexValue("distribution.about",
var distroVersion = Services.prefs.getCharPref("distribution.version");
var distroAbout = Services.prefs.getComplexValue("distribution.about",
Components.interfaces.nsISupportsString);
var distroField = document.getElementById("distribution");
@ -65,19 +64,9 @@ function init(aEvent)
// Pref is unset
}
var userAgentField = document.getElementById("userAgent");
userAgentField.value = navigator.userAgent;
var button = document.documentElement.getButton("extra2");
button.setAttribute("label", document.documentElement.getAttribute("creditslabel"));
button.setAttribute("accesskey", document.documentElement.getAttribute("creditsaccesskey"));
button.addEventListener("command", switchPage, false);
var acceptButton = document.documentElement.getButton("accept");
#ifdef XP_UNIX
acceptButton.setAttribute("icon", "close");
#ifdef MOZ_UPDATER
initUpdates();
#endif
acceptButton.focus();
#ifdef XP_MACOSX
// it may not be sized at this point, and we need its width to calculate its position
@ -86,34 +75,27 @@ function init(aEvent)
#endif
}
function uninit(aEvent)
#ifdef MOZ_UPDATER
/**
* Creates "Last Updated" message and sets up "Check for Updates..." button.
*/
function initUpdates()
{
if (aEvent.target != document)
return;
var iframe = document.getElementById("creditsIframe");
iframe.setAttribute("src", "");
var um = Components.classes["@mozilla.org/updates/update-manager;1"].
getService(Components.interfaces.nsIUpdateManager);
var browserBundle = Services.strings.
createBundle("chrome://browser/locale/browser.properties");
if (um.updateCount) {
let buildID = um.getUpdateAt(0).buildID;
let released = browserBundle.formatStringFromName("aboutdialog.released",
[buildID.substring(0, 4),
buildID.substring(4, 6),
buildID.substring(6, 8)], 3);
document.getElementById("released").setAttribute("value", released);
}
function switchPage(aEvent)
{
var button = aEvent.target;
if (button.localName != "button")
return;
var iframe = document.getElementById("creditsIframe");
if (gSelectedPage == 0) {
iframe.setAttribute("src", "chrome://browser/content/credits.xhtml");
button.setAttribute("label", document.documentElement.getAttribute("aboutlabel"));
button.setAttribute("accesskey", document.documentElement.getAttribute("aboutaccesskey"));
gSelectedPage = 1;
var checkForUpdates = document.getElementById("checkForUpdatesButton");
setupCheckForUpdates(checkForUpdates, browserBundle);
}
else {
iframe.setAttribute("src", "");
button.setAttribute("label", document.documentElement.getAttribute("creditslabel"));
button.setAttribute("accesskey", document.documentElement.getAttribute("creditsaccesskey"));
gSelectedPage = 0;
}
var modes = document.getElementById("modes");
modes.setAttribute("selectedIndex", gSelectedPage);
}
#endif

76
browser/base/content/aboutDialog.xul
View File

@ -22,6 +22,7 @@
#
# Contributor(s):
# Ehsan Akhgari <ehsan.akhgari@gmail.com>
# Margaret Leibovic <margaret.leibovic@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
@ -51,55 +52,62 @@
<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
#endif
<dialog xmlns:html="http://www.w3.org/1999/xhtml"
<window xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="aboutDialog"
windowtype="Browser:About"
onload="init(event);" onunload="uninit(event);"
onload="init(event);"
#ifdef XP_MACOSX
inwindowmenu="false"
buttons="extra2"
align="end"
#else
title="&aboutDialog.title;"
buttons="accept,extra2"
#ifdef XP_UNIX
buttonlabelaccept="&closeCmdGNOME.label;"
buttonaccesskeyaccept="&closeCmdGNOME.accesskey;"
#endif
#endif
creditslabel="&copyright;"
#ifdef XP_UNIX
creditsaccesskey="&copyrightGNOME.accesskey;"
#else
creditsaccesskey="&copyright.accesskey;"
#endif
aboutlabel="&aboutLink;"
aboutaccesskey="&aboutLink.accesskey;">
>
<script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
<script type="application/javascript" src="chrome://browser/content/aboutDialog.js"/>
<deck id="modes" flex="1">
<vbox flex="1" id="clientBox">
#expand <label id="version" value="&aboutVersion; __MOZ_APP_VERSION__"/>
<label id="distribution"/>
<label id="distributionId"/>
<description id="copyright">
<label
class="text-link" href="about:license"
>&licenseLinkText;</label>&licenseLinkSuffix;&trademarkInfo;
<vbox>
<hbox id="clientBox">
<vbox id="leftBox" flex="1"/>
<vbox id="rightBox" flex="1">
<description id="version">
#expand <label class="version-label" value="__MOZ_APP_VERSION__"/> <label class="version-label" id="released"/>
</description>
<label id="distribution" class="text-blurb"/>
<label id="distributionId" class="text-blurb"/>
#ifdef MOZ_UPDATER
<hbox>
<button id="checkForUpdatesButton" oncommand="checkForUpdates();" align="start"/>
<spacer flex="1"/>
</hbox>
#endif
<description class="text-blurb">
&community.start;<label class="text-link" href="http://www.mozilla.org">&community.mozillaLink;</label>&community.end;
</description>
<description class="text-blurb">
&contribute.start;<label class="text-link" href="http://www.mozilla.org/contribute">&contribute.getInvolvedLink;</label>&contribute.end;
</description>
<textbox id="userAgent" multiline="true" readonly="true" flex="1"/>
</vbox>
<vbox flex="1" id="creditsBox">
<iframe id="creditsIframe" flex="1"/>
</hbox>
<vbox id="bottomBox">
<hbox pack="center">
<label class="text-link bottom-link" href="about:license">&bottomLinks.license;</label>
<label class="text-link bottom-link" href="about:rights">&bottomLinks.rights;</label>
<label class="text-link bottom-link" href="http://www.mozilla.com/legal/privacy/">&bottomLinks.privacy;</label>
</hbox>
<description id="trademark">
<label class="trademark-label">&trademarkInfo.part1;</label>
<label class="trademark-label">&trademarkInfo.part2;</label>
</description>
</vbox>
</deck>
<separator class="groove" id="groove"/>
</vbox>
<keyset>
<key keycode="VK_ESCAPE" oncommand="window.close();"/>
</keyset>
#ifdef XP_MACOSX
#include browserMountPoints.inc
#endif
</dialog>
</window>

2
browser/base/content/baseMenuOverlay.xul
View File

@ -109,11 +109,13 @@
oncommand="openFeedbackPage()"
onclick="checkForMiddleClick(this, event);"/>
<menuseparator id="updateSeparator"/>
#ifdef XP_MACOSX
#ifdef MOZ_UPDATER
<menuitem id="checkForUpdates"
label="&updateCmd.label;"
class="menuitem-iconic"
oncommand="checkForUpdates();"/>
#endif
#endif
<menuseparator id="aboutSeparator"/>
<menuitem id="aboutName"

648
browser/base/content/credits.xhtml
View File

@ -1,648 +0,0 @@
<!-- -*- Mode: Java; tab-width: 2; 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>
# Ehsan Akhgari <ehsan.akhgari@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 *****
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
[
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
%brandDTD;
<!ENTITY % creditsDTD SYSTEM "chrome://browser/locale/credits.dtd">
%creditsDTD;
<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
%globalDTD;
]
>
<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;
bottom: 8px;
overflow: hidden;
z-index: 1;
width: 280px;
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;
line-height: 110%;
}
h2.title {
margin-top: 200px;
margin-bottom: 60px;
text-align: center;
}
.links {
font-weight: normal;
font-size: small;
font-style: italic;
text-align: center;
margin: 0px 0px 100px 0px;
}
.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/javascript" src="chrome://global/content/globalOverlay.js"></script>
<script type="application/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 }, 10000);
}
}
]]>
</script>
</head>
<body onload="init();" onunload="uninit();">
<div id="titleBox">
<img src="chrome://branding/content/aboutCredits.png" />
</div>
<div id="creditsBox">
<h2 class="title" dir="&locale.dir;">&brandFullName;&trade;
<div class="motto">&brandMotto;</div>
</h2>
<div class="links" dir="&locale.dir;">
&credit.thanks2; <a href="" link="about:credits" onclick="visitLink(event);">&credit.contributors2;</a>
</div>
<div class="creditsGroup">
<ul>
<li>Josh Aas</li>
<li>Robert Accettura</li>
<li>Lucas Adamski</li>
<li>Raymond Etornam Agbeame</li>
<li>Ehsan Akhgari</li>
<li>Sean Alamares</li>
<li>Pedro Alves</li>
<li>David Anderson</li>
<li>Harvey Anderson</li>
<li>Smokey Ardisson</li>
<li>Rob Arnold</li>
<li>Tomoya Asai</li>
<li>Chris AtLee</li>
<li>Dietrich Ayala</li>
<li>Mitchell Baker</li>
<li>Rhian Baker</li>
<li>Jeff Balogh</li>
<li>Jan Bambas</li>
<li>Rey Bango</li>
<li>Mark Banner</li>
<li>Jason Barnabe</li>
<li>David Baron</li>
<li>Colin Barrett</li>
<li>Curtis Bartley</li>
<li>Bo Bayles</li>
<li>Christopher Beard</li>
<li>Glen Beasley</li>
<li>Juan Becerra</li>
<li>Brian Behlendorf</li>
<li>Mike Beltzner</li>
<li>Mic Berman</li>
<li>Uri Bernstein</li>
<li>Christian Biesinger</li>
<li>Al Billings</li>
<li>Seth Bindernagel</li>
<li>Lukas Blakk</li>
<li>Jim Blandy</li>
<li>Chris Blizzard</li>
<li>Jamey Boje</li>
<li>David Bolter</li>
<li>Nelson Bolyard</li>
<li>Marco Bonardo</li>
<li>Carsten Book</li>
<li>Paul Booker</li>
<li>Jennifer Boriss</li>
<li>Dan Born</li>
<li>Arpad Borsos</li>
<li>David Boswell</li>
<li>Ondřej Brablc</li>
<li>Catherine Brady</li>
<li>Dave Bragsalla</li>
<li>Alex Buchanan</li>
<li>Igor Bukanov</li>
<li>Simon Bünzli</li>
<li>Lapo Calamandrei</li>
<li>Dave Camp</li>
<li>Rob Campbell</li>
<li>Regis Caspar</li>
<li>Garrett Casto</li>
<li>Tony Chang</li>
<li>Wan-Teh Chang</li>
<li>Emily Chen</li>
<li>Ginn Chen</li>
<li>Pascal Chevrel</li>
<li>Adam Christian</li>
<li>Tony Chung</li>
<li>Bob Clary</li>
<li>Wil Clouser</li>
<li>Mary Colvig</li>
<li>Majken Connor</li>
<li>Mike Connor</li>
<li>Chris Cooper</li>
<li>Eric Cooper</li>
<li>Paul Craciunoiu</li>
<li>Brian Crowder</li>
<li>John Daggett</li>
<li>David Dahl</li>
<li>Michael Davis</li>
<li>Neil Deakin</li>
<li>Julie Deroche</li>
<li>Aakash Desai</li>
<li>Ryan Doherty</li>
<li>Justin Dolske</li>
<li>Stephen Donner</li>
<li>Asa Dotzler</li>
<li>Chris Double</li>
<li>Joe Drew</li>
<li>Jason Duell</li>
<li>Karsten Düsterloh</li>
<li>Brendan Eich</li>
<li>Daniel Einspanjer</li>
<li>Kai Engert</li>
<li>Steve England</li>
<li>Madhava Enros</li>
<li>Behdad Esfahbod</li>
<li>Elika Etemad</li>
<li>Anthony Evans</li>
<li>Jason Evans</li>
<li>Alex Faaborg</li>
<li>Jane Finette</li>
<li>Mark Finkle</li>
<li>Darin Fisher</li>
<li>Jayson Fittipaldi</li>
<li>Justin Fitzhugh</li>
<li>Ryan Flint</li>
<li>Alix Franquet</li>
<li>Eli Friedman</li>
<li>Andreas Gal</li>
<li>Steven Garrity</li>
<li>Armen Zambrano Gasparnian</li>
<li>Serge Gautherie</li>
<li>Kevin Gerich</li>
<li>Taras Glek</li>
<li>Aravind Gottipati</li>
<li>Dão Gottwald</li>
<li>Zak Greant</li>
<li>Matthew Gregan</li>
<li>Will Guaraldi</li>
<li>Adam Guthrie</li>
<li>Mohammad Reza Haghighat</li>
<li>Andrei Hajdukewycz</li>
<li>Trevor Hardcastle</li>
<li>Basil Hashem</li>
<li>Ian Hayward</li>
<li>Ben Hearsum</li>
<li>Axel Hecht</li>
<li>Frank Hecker</li>
<li>Robert Helmer</li>
<li>Stefan Hermes</li>
<li>Jon Hicks</li>
<li>Graydon Hoare</li>
<li>Chris Hofmann</li>
<li>Timothy Hogan</li>
<li>Daniel Holbert</li>
<li>Bobby Holley</li>
<li>Mike Hommey</li>
<li>Stephen Horlander</li>
<li>Barbara Hueppe</li>
<li>Anthony Hughes</li>
<li>David Humphrey</li>
<li>Takeshi Ichimaru</li>
<li>Chris Ilias</li>
<li>Eri Inoue</li>
<li>Joichi Ito</li>
<li>Steven Johnson</li>
<li>Laurent Jouanneau</li>
<li>Robert Kaiser</li>
<li>Gen Kanai</li>
<li>Masanori Kaneko</li>
<li>Blake Kaplan</li>
<li>Mike Kaplinskiy</li>
<li>Michael Kaply</li>
<li>Mitch Kapor</li>
<li>Kazuyoshi Kato</li>
<li>Tomomi Kato</li>
<li>Alfred Kayser</li>
<li>Jonathan Kew</li>
<li>Paul Kim</li>
<li>Masatoshi Kimura</li>
<li>Austin King</li>
<li>Ria Klaassen</li>
<li>Marcia Knous</li>
<li>Nelson Ko</li>
<li>Michael Kohler</li>
<li>Gary Kwong</li>
<li>David Lanham</li>
<li>Brad Lassey</li>
<li>Delphine Lebédel</li>
<li>Edward Lee</li>
<li>Neil Lee</li>
<li>Raymond Lee</li>
<li>Garrett LeSage</li>
<li>Aaron Leventhal</li>
<li>Anne-Julie Ligneau</li>
<li>John Lilly</li>
<li>Zach Lipton</li>
<li>Kai Liu</li>
<li>Reed Loden</li>
<li>Lars Lohn</li>
<li>Robert Longson</li>
<li>Bob Lord</li>
<li>Phil Machalski</li>
<li>Joel Maher</li>
<li>Ere Maijala</li>
<li>David Mandelin</li>
<li>Gervase Markham</li>
<li>Sean Martell</li>
<li>Jim Mathies</li>
<li>Blair McBride</li>
<li>Erica McClure</li>
<li>Graeme McCutcheon</li>
<li>Patrick McManus</li>
<li>Heather Meeker</li>
<li>Walter Meinl</li>
<li>Myk Melez</li>
<li>Federico Mena-Quintero</li>
<li>Mark Mentovai</li>
<li>Laura Mesa</li>
<li>Steven Michaud</li>
<li>Matthew Middleton</li>
<li>Ted Mielczarek</li>
<li>Bernd Mielke</li>
<li>Dave Miller</li>
<li>Dan Mills</li>
<li>Michael Monreal</li>
<li>Simon Montagu</li>
<li>Derek Moore</li>
<li>Mike Morgan</li>
<li>Tiffney Mortensen</li>
<li>Dan Mosedale</li>
<li>Michael Moy</li>
<li>Jeff Muizelaar</li>
<li>Masayuki Nakano</li>
<li>Murali Nandigama</li>
<li>Marria Nazif</li>
<li>Kev Needham</li>
<li>Kaori Negoro</li>
<li>Nicholas Nethercote</li>
<li>Ben Newman</li>
<li>Nick Nguyen</li>
<li>Johnathan Nightingale</li>
<li>Timothy Nikkel</li>
<li>Andreas Nilsson</li>
<li>Tristan Nitot</li>
<li>Alice Nodelman</li>
<li>Matthew Noorenberghe</li>
<li>Michal Novotny</li>
<li>Robert O'Callahan</li>
<li>John O'Duinn</li>
<li>Paul O'Shannessy</li>
<li>Jan Odvárko</li>
<li>Tomoyuki Okazaki</li>
<li>Les Orchard</li>
<li>Jeremy Orem</li>
<li>Jason Orendorff</li>
<li>Hideo Oshima</li>
<li>Mats Palmgren</li>
<li>Stuart Parmenter</li>
<li>Jay Patel</li>
<li>Chris Pearce</li>
<li>Javier Pedemonte</li>
<li>Alfred Peng</li>
<li>Christian Persch</li>
<li>Kalle Persson</li>
<li>Ulisse Perusin</li>
<li>Olli Pettay</li>
<li>Julien Pierre</li>
<li>Anthony Piraino</li>
<li>Alex Polvi</li>
<li>Nickolay Ponomarev</li>
<li>Dan Portillo</li>
<li>Karen Prescott</li>
<li>Florian Quèze</li>
<li>Krupa Raj</li>
<li>Arun Ranganathan</li>
<li>Neil Rashbrook</li>
<li>Bret Reckard</li>
<li>J. Paul Reed</li>
<li>Rick Reitmaier</li>
<li>Robert Relyea</li>
<li>John Resig</li>
<li>Deb Richardson</li>
<li>Tim Riley</li>
<li>Phil Ringnalda</li>
<li>Julien Rivaud</li>
<li>Mikeal Rogers</li>
<li>David Rolnitzky</li>
<li>Asaf Romano</li>
<li>Oleg Romashin</li>
<li>Paul Rouget</li>
<li>Tim Rowley</li>
<li>Jesse Ruderman</li>
<li>Brian Ryner</li>
<li>Alexander Sack</li>
<li>Hideo Saito</li>
<li>Atsushi Sakai</li>
<li>Eiko Sakuma</li>
<li>Andrei Saprykin</li>
<li>Aki Sasaki</li>
<li>Ken Saunders</li>
<li>Robert Sayre</li>
<li>Mike Schroepfer</li>
<li>Kurt Schultz</li>
<li>Keith Schwarz</li>
<li>Justin Scott</li>
<li>Hiroshi Sekiya</li>
<li>Tara Shahian</li>
<li>Melissa Shapiro</li>
<li>Gavin Sharp</li>
<li>Mike Shaver</li>
<li>Eric Shepherd</li>
<li>Hiroshi Shimoda</li>
<li>Atsushi Shimono</li>
<li>Jungshik Shin</li>
<li>Jonas Sicking</li>
<li>Damon Sicore</li>
<li>Roger B. Sidje</li>
<li>Samuel Sidler</li>
<li>Henrik Skupin</li>
<li>John Slater</li>
<li>Benjamin Smedberg</li>
<li>Andrew Smith</li>
<li>Edwin Smith</li>
<li>Mark Smith</li>
<li>Window Snyder</li>
<li>Josh Soref</li>
<li>Nochum Sossonko</li>
<li>Ian Spence</li>
<li>Seth Spitzer</li>
<li>Markus Stange</li>
<li>Jakub Steiner</li>
<li>Johnny Stenback</li>
<li>Brandon Sterne</li>
<li>Rob Stradling</li>
<li>Robert Strong</li>
<li>Jay Sullivan</li>
<li>Vicky Sun</li>
<li>Alexander Surkov</li>
<li>Mark Surman</li>
<li>Andrew Sutherland</li>
<li>Clint Talbert</li>
<li>Margaret Tallman</li>
<li>David Tenser</li>
<li>Chris Thomas</li>
<li>Nick Thomas</li>
<li>Laura Thomson</li>
<li>Karl Tomlinson</li>
<li>Dave Townsend</li>
<li>Aaron Train</li>
<li>Phong Tran</li>
<li>Ben Turner</li>
<li>Doug Turner</li>
<li>Amié Tyrrel</li>
<li>Peter Van der Beken</li>
<li>Peter van der Woude</li>
<li>Teune van Steeg</li>
<li>Ryan VanderMeulen</li>
<li>Daniel Veditz</li>
<li>Michael Ventnor</li>
<li>Alexei Volkov</li>
<li>Vladimir Vukićević</li>
<li>Håkan Waara</li>
<li>Jeff Walden</li>
<li>Tracy Walker</li>
<li>Cheng Wang</li>
<li>Martijn Wargers</li>
<li>Jonathan Watt</li>
<li>Peter Weilbacher</li>
<li>Zack Weinberg</li>
<li>Frédéric Wenzel</li>
<li>Steffen Wilberg</li>
<li>Drew Willcoxon</li>
<li>Shawn Wilsher</li>
<li>Kathleen Wilson</li>
<li>Dan Witte</li>
<li>John Wolfe</li>
<li>Steve Won</li>
<li>Justin Wood</li>
<li>Michael Wu</li>
<li>Masahiro Yamada</li>
<li>Satoko Takita Yamaguchi (Chibi)</li>
<li>Christine Yen</li>
<li>Kohei Yoshino</li>
<li>Shigeru Yoshitake</li>
<li>Tanner M. Young</li>
<li>Boris Zbarsky</li>
<li>Marco Zehe</li>
<li>Matthew Zeier</li>
</ul>
<div dir="&locale.dir;">
&credit.translation;
</div>
</div>
<!-- organizational supporters -->
<div class="creditsGroup">
<h3 dir="&locale.dir;">&credit.thanks;</h3>
<ul>
<li>Google</li>
<li>Yahoo!</li>
<li>IBM</li>
<li>Sun Microsystems</li>
<li>Red Hat</li>
<li></li>
<li>Oregon State University - Open Source Lab</li>
<li></li>
<li>Global Netoptex, Inc</li>
<li>Internet Software Consortium</li>
<li></li>
<li>Cooley Godward, LLP</li>
<li>Greenburg Traurig, LLP</li>
<li></li>
<li>OutCast Communications</li>
<li></li>
<li>The Royal Order of Experience Design</li>
<li>Nobox</li>
<li>silverorange</li>
<li>Glaxstar</li>
<li></li>
<li>MozillaZine Community</li>
</ul>
</div>
<p id="gecko" class="center" dir="&locale.dir;">&credit.poweredByGeckoReg;</p>
<p class="footnote">
Mozilla Firefox&reg; and the Firefox logo are registered 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
Firefox name or logo. Gecko&reg; is a registered trademark of Netscape
Communications Corporation.</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://branding/content/aboutFooter.png" />
</div>
</body>
</html>

40
browser/base/content/utilityOverlay.js
View File

@ -496,14 +496,12 @@ function checkForUpdates()
}
#endif
function buildHelpMenu()
{
// Enable/disable the "Report Web Forgery" menu item. safebrowsing object
// may not exist in OSX
if (typeof safebrowsing != "undefined")
safebrowsing.setReportPhishingMenu();
#ifdef MOZ_UPDATER
/**
* Updates an element to reflect the state of available update services.
*/
function setupCheckForUpdates(checkForUpdates, aStringBundle)
{
var updates =
Components.classes["@mozilla.org/updates/update-service;1"].
getService(Components.interfaces.nsIApplicationUpdateService);
@ -513,21 +511,19 @@ function buildHelpMenu()
// Disable the UI if the update enabled pref has been locked by the
// administrator or if we cannot update for some other reason
var checkForUpdates = document.getElementById("checkForUpdates");
var canCheckForUpdates = updates.canCheckForUpdates;
checkForUpdates.setAttribute("disabled", !canCheckForUpdates);
if (!canCheckForUpdates)
return;
var strings = document.getElementById("bundle_browser");
var activeUpdate = um.activeUpdate;
// If there's an active update, substitute its name into the label
// we show for this item, otherwise display a generic label.
function getStringWithUpdateName(key) {
if (activeUpdate && activeUpdate.name)
return strings.getFormattedString(key, [activeUpdate.name]);
return strings.getString(key + "Fallback");
return aStringBundle.formatStringFromName(key, [activeUpdate.name], 1);
return aStringBundle.GetStringFromName(key + "Fallback");
}
// By default, show "Check for Updates..."
@ -548,11 +544,31 @@ function buildHelpMenu()
}
}
checkForUpdates.label = getStringWithUpdateName("updatesItem_" + key);
checkForUpdates.accessKey = strings.getString("updatesItem_" + key + ".accesskey");
checkForUpdates.accessKey = aStringBundle.
GetStringFromName("updatesItem_" + key + ".accesskey");
if (um.activeUpdate && updates.isDownloading)
checkForUpdates.setAttribute("loading", "true");
else
checkForUpdates.removeAttribute("loading");
}
#endif
function buildHelpMenu()
{
// Enable/disable the "Report Web Forgery" menu item. safebrowsing object
// may not exist in OSX
if (typeof safebrowsing != "undefined")
safebrowsing.setReportPhishingMenu();
#ifdef XP_MACOSX
#ifdef MOZ_UPDATER
var checkForUpdates = document.getElementById("checkForUpdates");
var browserBundle = document.getElementById("bundle_browser").stringBundle;
setupCheckForUpdates(checkForUpdates, browserBundle);
#else
// Needed by safebrowsing for inserting its menuitem so just hide it
document.getElementById("updateSeparator").hidden = true;
#endif
#else
// Needed by safebrowsing for inserting its menuitem so just hide it
document.getElementById("updateSeparator").hidden = true;

1
browser/base/jar.mn
View File

@ -26,7 +26,6 @@ browser.jar:
* content/browser/browser.js (content/browser.js)
* content/browser/browser.xul (content/browser.xul)
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/credits.xhtml (content/credits.xhtml)
* content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml)
* content/browser/inspector.html (content/inspector.html)
* content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul)

BIN
browser/branding/nightly/content/about-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
browser/branding/nightly/content/about-wordmark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
browser/branding/nightly/content/about.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 19 KiB

BIN
browser/branding/nightly/content/aboutCredits.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 17 KiB

BIN
browser/branding/nightly/content/aboutFooter.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 227 B

5
browser/branding/nightly/content/jar.mn
View File

@ -1,8 +1,7 @@
browser.jar:
% content branding %content/branding/ contentaccessible=yes
content/branding/about.png (about.png)
content/branding/aboutCredits.png (aboutCredits.png)
content/branding/aboutFooter.png (aboutFooter.png)
content/branding/about-logo.png (about-logo.png)
content/branding/about-wordmark.png (about-wordmark.png)
content/branding/icon48.png (icon48.png)
content/branding/icon64.png (icon64.png)
content/branding/icon128.png (../mozicon128.png)

3
browser/branding/nightly/locales/en-US/brand.dtd
View File

@ -1,4 +1,5 @@
<!ENTITY brandShortName "Minefield">
<!ENTITY brandFullName "Minefield">
<!ENTITY vendorShortName "Mozilla">
<!ENTITY trademarkInfo " ">
<!ENTITY trademarkInfo.part1 " ">
<!ENTITY trademarkInfo.part2 " ">

BIN
browser/branding/unofficial/content/about-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
browser/branding/unofficial/content/about-wordmark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
browser/branding/unofficial/content/about.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
browser/branding/unofficial/content/aboutCredits.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
browser/branding/unofficial/content/aboutFooter.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 764 B

5
browser/branding/unofficial/content/jar.mn
View File

@ -1,8 +1,7 @@
browser.jar:
% content branding %content/branding/ contentaccessible=yes
content/branding/about.png (about.png)
content/branding/aboutCredits.png (aboutCredits.png)
content/branding/aboutFooter.png (aboutFooter.png)
content/branding/about-logo.png (about-logo.png)
content/branding/about-wordmark.png (about-wordmark.png)
content/branding/icon48.png (icon48.png)
content/branding/icon64.png (icon64.png)
content/branding/icon128.png (../mozicon128.png)

6
browser/branding/unofficial/locales/en-US/brand.dtd
View File

@ -1,7 +1,5 @@
<!ENTITY brandShortName "Mozilla Developer Preview">
<!ENTITY brandFullName "Mozilla Developer Preview">
<!ENTITY vendorShortName "mozilla.org">
<!ENTITY trademarkInfo " ">
<!-- LOCALIZATION NOTE (releaseBaseURL): The about: page appends __MOZ_APP_VERSION__.html, e.g. 2.0.html -->
<!ENTITY releaseBaseURL "http://www.mozilla.org/projects/devpreview/releases/">
<!ENTITY trademarkInfo.part1 " ">
<!ENTITY trademarkInfo.part2 " ">

27
browser/locales/en-US/chrome/browser/aboutDialog.dtd
View File

@ -1,11 +1,18 @@
<!ENTITY aboutDialog.title "About &brandFullName;">
<!ENTITY copyright "Credits">
<!ENTITY copyright.accesskey "C">
<!ENTITY copyrightGNOME.accesskey "r">
<!ENTITY aboutLink "&lt; About &brandFullName;">
<!ENTITY aboutLink.accesskey "A">
<!ENTITY aboutVersion "version">
<!ENTITY closeCmdGNOME.label "Close">
<!ENTITY closeCmdGNOME.accesskey "C">
<!ENTITY licenseLinkText "Licensing information">
<!ENTITY licenseLinkSuffix ".">
<!ENTITY community.start "&brandShortName; is designed by ">
<!ENTITY community.mozillaLink "&vendorShortName;">
<!ENTITY community.end ", a global community working together to make the Internet better. We believe that the Internet should be open, public, and accessible to everyone without any restrictions.">
<!ENTITY contribute.start "Sound interesting? ">
<!ENTITY contribute.getInvolvedLink "Get involved!">
<!ENTITY contribute.end "">
<!-- LOCALIZAION NOTE(bottomLinks.license): This is a link title that links to about:license. -->
<!ENTITY bottomLinks.license "Licensing Information">
<!-- LOCALIZAION NOTE(bottomLinks.rights): This is a link title that links to about:rights. -->
<!ENTITY bottomLinks.rights "End User Rights">
<!-- LOCALIZAION NOTE(bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy. -->
<!ENTITY bottomLinks.privacy "Privacy Policy">

5
browser/locales/en-US/chrome/browser/browser.properties
View File

@ -288,3 +288,8 @@ tabView2.title=%S - Group Your Tabs
extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Default
extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=The default theme.
# About Firefox Dialog
# LOCALIZATION NOTE (aboutdialog.released): %1$S = year, %2$S = month,
# %3$S = day. These are just numbers, and the month/day values are zero-padded.
aboutdialog.released=(released %2$S-%3$S-%1$S)

15
browser/locales/en-US/chrome/browser/credits.dtd
View File

@ -1,15 +0,0 @@
<!ENTITY brandMotto "Rediscover the Web">
<!ENTITY credit.thanks "Special Thanks To">
<!ENTITY credit.thanks2 "Many thanks to our">
<!ENTITY credit.contributors2 "contributors">
<!-- localization credits look like this: -->
<!--
<!ENTITY credit.translation
"<h3>Translators</h3><ul><li>Name Here</li></ul>">
-->
<!ENTITY credit.translation "">
<!ENTITY credit.memory "In Fond Memory Of">
<!ENTITY credit.poweredByGeckoReg "Powered by Gecko&reg;">

1
browser/locales/jar.mn
View File

@ -11,7 +11,6 @@
#ifdef MOZ_SERVICES_SYNC
locale/browser/aboutSyncTabs.dtd (%chrome/browser/aboutSyncTabs.dtd)
#endif
locale/browser/credits.dtd (%chrome/browser/credits.dtd)
* locale/browser/browser.dtd (%chrome/browser/browser.dtd)
locale/browser/baseMenuOverlay.dtd (%chrome/browser/baseMenuOverlay.dtd)
locale/browser/browser.properties (%chrome/browser/browser.properties)

4
browser/themes/gnomestripe/browser/browser.css
View File

@ -1650,10 +1650,6 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
visibility: collapse;
}
#checkForUpdates[loading="true"] {
list-style-image: url("chrome://global/skin/icons/loading_16.png");
}
#download-monitor {
list-style-image: url("chrome://browser/skin/Toolbar-small.png");
-moz-image-region: rect(0px 16px 16px 0px);

4
browser/themes/winstripe/browser/browser.css
View File

@ -1786,10 +1786,6 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
visibility: collapse;
}
#checkForUpdates[loading="true"] {
list-style-image: url("chrome://global/skin/icons/loading_16.png");
}
/* Bookmarks toolbar */
#PlacesToolbarDropIndicator {
list-style-image: url(chrome://browser/skin/places/toolbarDropMarker.png);

BIN
other-licenses/branding/firefox/content/about-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 54 KiB

BIN
other-licenses/branding/firefox/content/about-wordmark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
other-licenses/branding/firefox/content/about.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

BIN
other-licenses/branding/firefox/content/aboutCredits.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
other-licenses/branding/firefox/content/aboutFooter.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 764 B

5
other-licenses/branding/firefox/content/jar.mn
View File

@ -1,8 +1,7 @@
browser.jar:
% content branding %content/branding/ contentaccessible=yes
content/branding/about.png (about.png)
content/branding/aboutCredits.png (aboutCredits.png)
content/branding/aboutFooter.png (aboutFooter.png)
content/branding/about-logo.png (about-logo.png)
content/branding/about-wordmark.png (about-wordmark.png)
content/branding/icon48.png (icon48.png)
content/branding/icon64.png (icon64.png)
content/branding/icon128.png (../mozicon128.png)

4
other-licenses/branding/firefox/locales/en-US/brand.dtd
View File

@ -1,5 +1,5 @@
<!ENTITY brandShortName "Firefox">
<!ENTITY brandFullName "Mozilla Firefox">
<!ENTITY vendorShortName "Mozilla">
<!-- LOCALIZATION NOTE (trademarkInfo): note that there is no space between licenseLinkText (and its trailing licenseLinkSuffix entity) and this entity, so if your locale needs a space between sentences, you need to put it at the start of this entity. -->
<!ENTITY trademarkInfo " Firefox and the Firefox logos are trademarks of the Mozilla Foundation. Some of the trademarks used under license from The Charlton Company.">
<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
<!ENTITY trademarkInfo.part2 "Some of the trademarks used under license from The Charlton Company.">