Index: VARIABLES =================================================================== RCS file: /cvsroot/mozilla-org/html/VARIABLES,v retrieving revision 1.53 diff -p -u -8 -r1.53 VARIABLES --- VARIABLES 2 Oct 2004 00:50:20 -0000 1.53 +++ VARIABLES 4 Nov 2004 10:56:19 -0000 @@ -26,31 +26,36 @@ %%VAR MOZILLA-DEVELOPMENT-X86LINUX-SIZE 13MB %%VAR MOZILLA-DEVELOPMENT-MACOSX-SIZE 15MB %%VAR MOZILLA-DEVELOPMENT-WIN32-SIZE 12MB %%VAR MOZILLA-DEVELOPMENT-X86LINUX-DL-TIME 32.5 min @ 56k/s %%VAR MOZILLA-DEVELOPMENT-MACOSX-DL-TIME 37.8 min @ 56k/s %%VAR MOZILLA-DEVELOPMENT-WIN32-DL-TIME 30.0 min @ 56k/s %%VAR FIREFOX-VERSION Firefox Preview Release -%%VAR FIREFOX-WIN32 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.10.1/Firefox Setup 1.0PR.exe -%%VAR FIREFOX-X86LINUX http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.10.1/firefox-1.0PR-i686-linux-gtk2+xft-installer.tar.gz -%%VAR FIREFOX-X86LINUX-XFT http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.10.1/firefox-1.0PR-i686-linux-gtk2+xft-installer.tar.gz -%%VAR FIREFOX-MACOSX http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.10.1/Firefox 1.0PR.dmg.gz -%%VAR FIREFOX-EU-WIN32 http://ftp.eu.mozilla.org/pub/mozilla.org/firefox/releases/0.10.1/Firefox Setup 1.0PR.exe -%%VAR FIREFOX-EU-X86LINUX http://ftp.eu.mozilla.org/pub/mozilla.org/firefox/releases/0.10.1/firefox-1.0PR-i686-linux-gtk2+xft-installer.tar.gz -%%VAR FIREFOX-EU-X86LINUX-XFT http://ftp.eu.mozilla.org/pub/mozilla.org/firefox/releases/0.10.1/firefox-1.0PR-i686-linux-gtk2+xft-installer.tar.gz -%%VAR FIREFOX-EU-MACOSX http://ftp.eu.mozilla.org/pub/mozilla.org/firefox/releases/0.10.1/Firefox 1.0PR.dmg.gz -%%VAR FIREFOX-OTHER http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.10.1/contrib/ -%%VAR FIREFOX-WIN32-SIZE 4.5MB -%%VAR FIREFOX-X86LINUX-SIZE 8.1MB -%%VAR FIREFOX-MACOSX-SIZE 8.4MB +%%VAR FIREFOX-WIN32 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/win32/en-US/Firefox Setup 1.0.exe +%%VAR FIREFOX-X86LINUX http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/linux-i686/en-US/firefox-1.0.installer.tar.gz +%%VAR FIREFOX-MACOSX http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/mac/en-US/Firefox 1.0.dmg.gz +%%VAR FIREFOX-OTHER http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/ +%%VAR FIREFOX-WIN32-SIZE 4.7MB +%%VAR FIREFOX-X86LINUX-SIZE 8.2MB +%%VAR FIREFOX-MACOSX-SIZE 8.6MB +%%VAR FIREFOX-WIN32-SIZE-QUOTED "4.7MB" +%%VAR FIREFOX-X86LINUX-SIZE-QUOTED "8.2MB" +%%VAR FIREFOX-MACOSX-SIZE-QUOTED "8.6MB" %%VAR FIREFOX-WIN32-DL-TIME 11.7 min @ 56k/s %%VAR FIREFOX-X86LINUX-DL-TIME 20.2 min @ 56k/s %%VAR FIREFOX-MACOSX-DL-TIME 21.5 min @ 56k/s +%%VAR FIREFOX-WIN32-FILENAME-QUOTED "Firefox Setup 1.0.exe" +%%VAR FIREFOX-X86LINUX-FILENAME-QUOTED "firefox-1.0.installer.tar.gz" +%%VAR FIREFOX-MACOSX-FILENAME-QUOTED "Firefox 1.0.dmg.gz" +%%VAR FIREFOX-RELEASES-DIR-QUOTED "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/" +%%VAR FIREFOX-APP-VERSION-QUOTED "1.0" +%%VAR FIREFOX-DOWNLOADS-PAGE http://www.mozilla.org/products/firefox/all.html +%%VAR FIREFOX-DOWNLOADS-PAGE-QUOTED "http://www.mozilla.org/products/firefox/all.html" %%VAR FIREFOX-DEVEL-VERSION Firefox Preview Release RC %%VAR FIREFOX-DEVEL-WIN32 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0PRrc/FirefoxSetup-1.0PRrc.exe %%VAR FIREFOX-DEVEL-X86LINUX http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0PRrc/firefox-1.0PRrc-i686-linux-gtk2+xft-installer.tar.gz %%VAR FIREFOX-DEVEL-X86LINUX-XFT http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0PRrc/firefox-1.0PRrc-i686-linux-gtk2+xft-installer.tar.gz %%VAR FIREFOX-DEVEL-MACOSX http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0PRrc/firefox-1.0PRrc-mac.dmg.gz %%VAR FIREFOX-EU-DEVEL-WIN32 http://ftp.eu.mozilla.org/pub/mozilla.org/firefox/releases/1.0PRrc/FirefoxSetup-1.0PRrc.exe %%VAR FIREFOX-EU-DEVEL-X86LINUX http://ftp.eu.mozilla.org/pub/mozilla.org/firefox/releases/1.0PRrc/firefox-1.0PRrc-i686-linux-gtk2+xft-installer.tar.gz Index: download.html =================================================================== RCS file: /cvsroot/mozilla-org/html/download.html,v retrieving revision 1.43 diff -p -u -8 -r1.43 download.html --- download.html 7 Sep 2004 03:36:26 -0000 1.43 +++ download.html 4 Nov 2004 10:56:19 -0000 @@ -39,21 +39,21 @@

Mozilla Downloads

%%FIREFOX-VERSION%%
%%FIREFOX-VERSION%%

Our next generation browser is lightning fast in every way. Enjoy!

-

download: +

download (english): Windows (%%FIREFOX-WIN32-SIZE%%), Linux (%%FIREFOX-X86LINUX-SIZE%%), Mac OS X (%%FIREFOX-MACOSX-SIZE%%), - More… + More Systems and Languages…

%%THUNDERBIRD-VERSION%%
%%THUNDERBIRD-VERSION%%

An e-mail and newsgroup client with powerful, new junk mail controls.

download: Index: download.js =================================================================== RCS file: download.js diff -N download.js --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ download.js 4 Nov 2004 10:56:19 -0000 @@ -0,0 +1,227 @@ +var gPlatform = PLATFORM_WINDOWS; + +var PLATFORM_OTHER = 0; +var PLATFORM_WINDOWS = 1; +var PLATFORM_LINUX = 2; +var PLATFORM_MACOSX = 3; +var PLATFORM_MAC = 4; + +if (navigator.platform.indexOf("Win32") != -1) + gPlatform = PLATFORM_WINDOWS; +else if (navigator.platform.indexOf("Linux") != -1) + gPlatform = PLATFORM_LINUX; +else if (navigator.userAgent.indexOf("Mac OS X") != -1) + gPlatform = PLATFORM_MACOSX; +else if (navigator.userAgent.indexOf("MSIE 5.2") != -1) + gPlatform = PLATFORM_MACOSX; +else if (navigator.platform.indexOf("Mac") != -1) + gPlatform = PLATFORM_MAC; +else + gPlatform = PLATFORM_OTHER; + +function getPlatformFileName(aPlatform) +{ + switch (aPlatform) { + case PLATFORM_WINDOWS: + return %%FIREFOX-WIN32-FILENAME-QUOTED%%; + case PLATFORM_LINUX: + return %%FIREFOX-X86LINUX-FILENAME-QUOTED%%; + case PLATFORM_MACOSX: + return %%FIREFOX-MACOSX-FILENAME-QUOTED%%; + } + return ""; +} + +function getPlatformName(aPlatform) +{ + switch (aPlatform) { + case PLATFORM_WINDOWS: + return "Windows"; + case PLATFORM_LINUX: + return "Linux i686"; + case PLATFORM_MACOSX: + return "MacOS X"; + } + return "Unknown"; +} + +function getPlatformFileSize(aPlatform) +{ + switch (aPlatform) { + case PLATFORM_WINDOWS: + return %%FIREFOX-WIN32-SIZE-QUOTED%%; + case PLATFORM_LINUX: + return %%FIREFOX-X86LINUX-SIZE-QUOTED%%; + case PLATFORM_MACOSX: + return %%FIREFOX-MACOSX-SIZE-QUOTED%%; + } + return "Unknown"; +} + +function getDownloadURLForLanguage(aABCD, aPlatform) +{ + var url = %%FIREFOX-RELEASES-DIR-QUOTED%% + %%FIREFOX-APP-VERSION-QUOTED%%; + + switch (aPlatform) { + case PLATFORM_WINDOWS: + url += "/win32/"; + break; + case PLATFORM_LINUX: + url += "/linux-i686/"; + break; + case PLATFORM_MACOSX: + url += "/mac/"; + break; + default: + return %%FIREFOX-DOWNLOADS-PAGE-QUOTED%%; + } + + return url + aABCD + "/" + getPlatformFileName(aPlatform); +} + +var gLanguages = { + "ast": { official: true, name: "Asturian", regions: { "es": null } }, + "ca": { official: true, name: "Catalan", regions: { "ad": null } }, + "cs": { official: true, name: "Czech", regions: { "cz": null } }, + "da": { official: true, name: "Danish", regions: { "dk": null } }, + "de": { official: true, name: "German", regions: { "de": null } }, + "el": { official: true, name: "Greek", regions: { "gr": null } }, + "en": { official: true, name: "English", regions: { "us": null, "gb": null } }, + "es": { official: true, name: "Spanish", regions: { "es": null, "ar": null } }, + "fi": { official: true, name: "Finnish", regions: { "fi": null } }, + "fr": { official: true, name: "French", regions: { "fr": null } }, + "ga": { official: true, name: "Interlingue", regions: { "ie": null } }, + "he": { official: true, name: "Hebrew", regions: { "il": null } }, + "hu": { official: true, name: "Hungarian", regions: { "hu": null } }, + "it": { official: true, name: "Italian", regions: { "it": null } }, + "ja": { official: true, name: "Japanese", regions: { "jp": null } }, + "ko": { official: true, name: "Korean", regions: { "ko": null } }, + "nb": { official: true, name: "Norwegian", regions: { "no": null } }, + "nl": { official: true, name: "Dutch", regions: { "nl": null } }, + "pl": { official: true, name: "Polish", regions: { "pl": null } }, + "pt": { official: true, name: "Breton", regions: { "br": null } }, + "ro": { official: true, name: "Romanian", regions: { "ro": null } }, + "ru": { official: true, name: "Russian", regions: { "ru": null } }, + "sl": { official: true, name: "Singhalese", regions: { "si": null } }, + "sq": { official: true, name: "Albanian", regions: { "al": null } }, + "sv": { official: true, name: "Swedish", regions: { "se": null } }, + "tr": { official: true, name: "Turkish", regions: { "tr": null } }, + "zh": { official: true, name: "Chinese", regions: { "cn": "Chinese (Traditional)", "tw": "Chinese (Simplified)" } } +}; + +function LanguageID(aABCD, aPrettyName) +{ + this.abCD = aABCD; + this.prettyName = aPrettyName; +} + +function getLanguageIDs() +{ + var language = ""; + if ("language" in navigator && navigator.language) + language = navigator.language; + else if ("userLanguage" in navigator && navigator.userLanguage) + language = navigator.userLanguage; + else if ("systemLanguage" in navigator && navigator.systemLanguage) + language = navigator.systemLanguage; + + if (language == "") + language = "en-US"; + + language = language.toLowerCase(); + var languageCode = language.split("-")[0]; + var regionCode = language.split("-")[1]; + + if (languageCode in gLanguages && gLanguages[languageCode].official) { + // We have a localized build in this language, check for regions... + var prettyName = gLanguages[languageCode].name; + + if (regionCode in gLanguages[languageCode].regions) { + // We have a localized build for this *region*, check to see if there + // is an overridden local pretty name, then return the language ID. + if (gLanguages[languageCode].regions[regionCode]) + prettyName = gLanguages[languageCode].regions[regionCode]; + return [new LanguageID(languageCode + "-" + regionCode.toUpperCase(), prettyName)]; + } + else { + // We have a localized build for this language, but not this region. + // Show all available regions and let the user pick. + var ids = []; + + for (var region in gLanguages[languageCode].regions) { + var prettyNameLocal = null; + if (gLanguages[languageCode].regions[region]) + prettyNameLocal = gLanguages[languageCode].regions[region]; + if (!prettyNameLocal) + prettyNameLocal = prettyName + " (" + region.toUpperCase() + ")"; + ids.push(new LanguageID(languageCode + "-" + region.toUpperCase(), + prettyNameLocal)); + + } + + return ids; + } + } + return null; +} + +function writeDownloadItem(aLanguageID) +{ + var downloadURL = getDownloadURLForLanguage(aLanguageID.abCD, gPlatform); + document.writeln("

Free Download<\/strong><\/a><\/h3>"); + document.writeln(" for " + getPlatformName(gPlatform) + ", " + aLanguageID.prettyName + " (" + getPlatformFileSize(gPlatform) + ")<\/span><\/span>"); +} + +function writeDownloadsBox() +{ + document.writeln("
"); + // Show the dynamic links + switch (gPlatform) { + case PLATFORM_MAC: + document.writeln(" MacOS 9 and earlier are not supported<\/a>"); + break; + case PLATFORM_OTHER: + document.writeln(" Download Link!<\/a>"); + break; + default: + var languageIDs = getLanguageIDs(); + if (!languageIDs) { + // No language data available, show en-US download link, and link to full + // download menu. + writeDownloadItem(new LanguageID("en-US", "English")); + + // Write link to full download menu + document.writeln(" Other Systems and Languages<\/span><\/span>"); + } + else { + for (var i = 0; i < languageIDs.length; ++i) + writeDownloadItem(languageIDs[i]); + } + } + document.writeln(" <\/div>"); +} + +function writeDownloadsTable() +{ + document.writeln(""); + + for (var language in gLanguages) { + for (var region in gLanguages[language].regions) { + var code = language + "-" + region.toUpperCase(); + var prettyName = gLanguages[language].regions[region] || gLanguages[language].name + " (" + region.toUpperCase() + ")"; + document.writeln(""); + document.writeln(""); + document.writeln(""); + document.writeln(""); + } + } + + document.writeln("
Language:WindowsMacOS XLinux i686
" + prettyName + "DownloadDownloadDownload
"); +} + +if ("writeDownloadsBox" in gDownloadsConfig && gDownloadsConfig.writeDownloadsBox) + writeDownloadsBox(); + +if ("writeDownloadsTable" in gDownloadsConfig && gDownloadsConfig.writeDownloadsTable) + writeDownloadsTable(); + Index: index.html =================================================================== RCS file: /cvsroot/mozilla-org/html/index.html,v retrieving revision 1.494 diff -p -u -8 -r1.494 index.html --- index.html 28 Oct 2004 13:07:08 -0000 1.494 +++ index.html 4 Nov 2004 10:56:19 -0000 @@ -12,74 +12,16 @@ - -
@@ -121,22 +63,31 @@ Learn more about Firefox

Firefox 1.0 Preview Release

The safer, faster, better web browser featuring tabbed browsing, integrated search and live bookmarks. Stop pop-ups, spyware and viruses. Get Firefox and spread the word! “I suggest dumping Microsoft's Internet Explorer” — Walt Mossberg, Wall Street Journal, Sept 16

+ +
Index: css/cavendish/home.css =================================================================== RCS file: /cvsroot/mozilla-org/html/css/cavendish/home.css,v retrieving revision 1.2 diff -p -u -8 -r1.2 home.css --- css/cavendish/home.css 31 Aug 2004 21:30:24 -0000 1.2 +++ css/cavendish/home.css 4 Nov 2004 10:56:20 -0000 @@ -113,14 +113,14 @@ img.promo { } .frontcolumnlast { width: 33%; float: left; } .homepage .download { - width: 200px; + width: 270px; } .homepage .shop { width: 175px; } Index: css/cavendish/template.css =================================================================== RCS file: /cvsroot/mozilla-org/html/css/cavendish/template.css,v retrieving revision 1.4 diff -p -u -8 -r1.4 template.css --- css/cavendish/template.css 1 Sep 2004 18:48:33 -0000 1.4 +++ css/cavendish/template.css 4 Nov 2004 10:56:20 -0000 @@ -187,17 +187,17 @@ #nav li span { /* used for un-linked menu items */ display: block; padding: 6px 10px; font-weight: bold; color: #666; } - #nav li span#configParent, #nav li span #configuration { + #nav li span.configParent, #nav li span .configuration { display: inline; font-weight: normal; padding: 0; } #nav li a { display: block; padding: 6px 10px; Index: products/firefox/NOMENU =================================================================== RCS file: /cvsroot/mozilla-org/html/products/firefox/NOMENU,v retrieving revision 1.7 diff -p -u -8 -r1.7 NOMENU --- products/firefox/NOMENU 1 Nov 2004 07:53:47 -0000 1.7 +++ products/firefox/NOMENU 4 Nov 2004 10:56:28 -0000 @@ -4,9 +4,10 @@ buttons.html shelf.html download.html live-bookmarks.html tabbed-browsing.html search.html central.html central-lite.html text-zoom.html -ui-customize.html \ No newline at end of file +ui-customize.html +all.html Index: products/firefox/all.html =================================================================== RCS file: products/firefox/all.html diff -N products/firefox/all.html --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ products/firefox/all.html 4 Nov 2004 10:56:28 -0000 @@ -0,0 +1,29 @@ + + + + Mozilla Firefox - Next Generation Browser + + + + + + +
+
+ + + +
+ + + + Index: products/firefox/index.html =================================================================== RCS file: /cvsroot/mozilla-org/html/products/firefox/index.html,v retrieving revision 1.74 diff -p -u -8 -r1.74 index.html --- products/firefox/index.html 30 Oct 2004 17:58:05 -0000 1.74 +++ products/firefox/index.html 4 Nov 2004 10:56:28 -0000 @@ -1,107 +1,56 @@ Firefox - Rediscover the web -

Firefox: the browser, reloaded

The Firefox Preview Release empowers you to browse faster, more safely, and more efficiently than with any other browser. Join more than 7 million others and make the switch today—Firefox imports your Favorites, settings and other information, so you have nothing to lose.

- -

Why Use Firefox?

Beware of spyware. If you can, use the Firefox browser.- USA Today

Better than Internet Explorer by leaps and bounds.- FORBES

Popup Blocking