зеркало из https://github.com/mozilla/gecko-dev.git
Bug #241029 --> polish the about dialog to account for the new branding artwork.
change copy right notice to include artwork trademark
This commit is contained in:
Родитель
8ddd2f995b
Коммит
5414d72259
|
@ -6,16 +6,12 @@
|
|||
background-color: #FFFFFF;
|
||||
background-image: url("chrome://messenger/content/about-thunderbird.png");
|
||||
background-repeat: no-repeat;
|
||||
padding-top: 203px;
|
||||
padding-top: 216px;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
#brandName {
|
||||
font-weight: bold; font-size: larger;
|
||||
}
|
||||
|
||||
#detailsBox {
|
||||
padding: 8px 10px 10px 8px;
|
||||
#versionWrapper {
|
||||
margin: 0px 0px 3px 20px;
|
||||
}
|
||||
|
||||
#versionField {
|
||||
|
@ -23,10 +19,12 @@
|
|||
-moz-appearance: none;
|
||||
border: none;
|
||||
font-weight: bold;
|
||||
color: #909090;
|
||||
}
|
||||
|
||||
#copyrightLink {
|
||||
#copyright {
|
||||
color: #909090;
|
||||
margin: 0px 0px 3px 20px;
|
||||
}
|
||||
|
||||
#groove {
|
||||
|
|
|
@ -51,18 +51,15 @@
|
|||
id="aboutDialog"
|
||||
buttons="accept,extra2"
|
||||
onload="onLoad();"
|
||||
title="&aboutDialog.title;" creditslabel="&credits;" aboutlabel="&aboutLink;"
|
||||
title="&aboutDialog.title;" creditslabel="&credits;" aboutlabel="&aboutLink;" versionlabel="&aboutVersion;"
|
||||
style="width: 299px; height: 330px;">
|
||||
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
function onLoad() {
|
||||
var versionField = document.getElementById("versionField");
|
||||
var hidversionField = document.getElementById("hidversionField");
|
||||
var brandFullNameEl = document.getElementById("brandFullName");
|
||||
hidversionField.value = brandFullNameEl.firstChild.nodeValue + ' ' + navigator.vendorSub + ' (' + navigator.productSub + ')';
|
||||
versionField.value = hidversionField.value;
|
||||
versionField.width = hidversionField.width;
|
||||
versionField.value = document.documentElement.getAttribute("versionlabel") + ' '
|
||||
+ navigator.vendorSub + ' (' + navigator.productSub + ')';
|
||||
|
||||
var button = document.documentElement.getButton("extra2");
|
||||
button.setAttribute("label", document.documentElement.getAttribute("creditslabel"));
|
||||
|
@ -70,7 +67,6 @@
|
|||
button.addEventListener("command", switchPage, false);
|
||||
}
|
||||
|
||||
|
||||
function uninit(aEvent)
|
||||
{
|
||||
if (aEvent.target != document)
|
||||
|
@ -79,17 +75,6 @@
|
|||
iframe.setAttribute("src", "");
|
||||
}
|
||||
|
||||
function loadExternalLink() {
|
||||
try {
|
||||
var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();
|
||||
messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
|
||||
messenger.launchExternalURL(document.getElementById('copyrightLink').getAttribute("href"));
|
||||
} catch (ex) {}
|
||||
|
||||
// return false, so we don't load the href in the about dialog
|
||||
return false;
|
||||
}
|
||||
|
||||
function switchPage(aEvent)
|
||||
{
|
||||
var button = aEvent.target;
|
||||
|
@ -115,30 +100,18 @@
|
|||
|
||||
<deck id="modes" flex="1">
|
||||
<vbox flex="1" id="clientBox">
|
||||
<vbox id="detailsBox" align="center" flex="1">
|
||||
<separator class="thin"/>
|
||||
|
||||
<hbox>
|
||||
<vbox>
|
||||
<label id="hidversionField" style="padding: 0px; visibility: hidden; font-weight: bold;"/>
|
||||
<textbox id="versionField" readonly="true" class="plain" style="padding-left: 6px !important;" tabindex="2"/>
|
||||
<vbox id="versionWrapper">
|
||||
<textbox id="versionField" readonly="true" class="plain" tabindex="2"/>
|
||||
</vbox>
|
||||
</hbox>
|
||||
|
||||
<separator class="thin"/>
|
||||
|
||||
<html:a id="copyrightLink" onclick="return loadExternalLink();" href="©rightLink;" style="display: block;" tabindex="3">©rightText;</html:a>
|
||||
</vbox>
|
||||
<description id="copyright">©rightText;</description>
|
||||
</vbox>
|
||||
|
||||
<vbox flex="1" id="creditsBox">
|
||||
<html:iframe style="border: 0px;" id="creditsIframe" src="chrome://messenger/locale/credits.html" flex="1"/>
|
||||
</vbox>
|
||||
</deck>
|
||||
|
||||
<separator class="groove" id="groove"/>
|
||||
|
||||
<!-- Localizable strings (from .dtd) -->
|
||||
<strings style="display:none;">
|
||||
<string id="brandFullName">&brandFullName;</string>
|
||||
</strings>
|
||||
</dialog>
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
<!ENTITY aboutDialog.title "About &brandShortName;">
|
||||
<!ENTITY credits "Credits">
|
||||
<!ENTITY aboutLink "< About &brandShortName;">
|
||||
<!ENTITY copyrightText "©1998-2004 Contributors. All Rights Reserved.">
|
||||
<!ENTITY copyrightLink "http://www.mozilla.org/products/thunderbird/">
|
||||
<!ENTITY aboutVersion "version">
|
||||
<!ENTITY copyrightText "©1998-2004 Contributors. All Rights Reserved. Mozilla Thunderbird and the
|
||||
Thunderbird logos are trademarks of the Mozilla Foundation. All rights
|
||||
reserved.">
|
||||
|
|
Загрузка…
Ссылка в новой задаче