зеркало из https://github.com/mozilla/pjs.git
Bug 435079 (Composer pref pane migration), landing missing bits from prev. m-c landing. Original patch: r+sr=Neil.
This commit is contained in:
Родитель
a1455b60c2
Коммит
6e0a36c427
|
@ -174,7 +174,7 @@ function SetColorPreview(aPreviewID, aColor)
|
||||||
function UpdateBgImagePreview(aImage)
|
function UpdateBgImagePreview(aImage)
|
||||||
{
|
{
|
||||||
var colorPreview = document.getElementById("ColorPreview");
|
var colorPreview = document.getElementById("ColorPreview");
|
||||||
colorPreview.style.backgroundImage = !aImage ? "" : "url(" + aImage + ")";
|
colorPreview.style.backgroundImage = aImage && "url(" + aImage + ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sets browser background/foreground colors
|
// Sets browser background/foreground colors
|
||||||
|
|
|
@ -1,95 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<!-- ***** 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 Communicator client code, released
|
|
||||||
March 31, 1998.
|
|
||||||
|
|
||||||
The Initial Developer of the Original Code is
|
|
||||||
Netscape Communications Corporation.
|
|
||||||
Portions created by the Initial Developer are Copyright (C) 1998-1999
|
|
||||||
the Initial Developer. All Rights Reserved.
|
|
||||||
|
|
||||||
Contributor(s):
|
|
||||||
|
|
||||||
Alternatively, the contents of this file may be used under the terms of
|
|
||||||
either of 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 ***** -->
|
|
||||||
|
|
||||||
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
|
|
||||||
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
|
|
||||||
|
|
||||||
<!DOCTYPE page SYSTEM "chrome://editor/locale/pref-publish.dtd" >
|
|
||||||
<page xmlns:html="http://www.w3.org/1999/xhtml"
|
|
||||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
|
||||||
title="&pref.publish.title;"
|
|
||||||
onload="if( parent.handle ) parent.handle.onpageload( 'pref-publish' ); else parent.queuedTag = 'pref-publish';">
|
|
||||||
|
|
||||||
<html:div flex="100%">
|
|
||||||
<html:div id="top">
|
|
||||||
<html:span id="lefttext">&composerHeader.label;</html:span>
|
|
||||||
</html:div>
|
|
||||||
|
|
||||||
|
|
||||||
<html:table>
|
|
||||||
<html:tr>
|
|
||||||
<html:td>
|
|
||||||
<html:input name="author" type="checkbox" id="editorPublishKeepImages"
|
|
||||||
pref="true" preftype="bool" prefstring="editor.publish_keep_images" />
|
|
||||||
<html:label for="editorPublishKeepImages">&maintainCheckbox.label;</html:label>
|
|
||||||
<html:br />&adjustDesc.label;
|
|
||||||
</html:td>
|
|
||||||
</html:tr>
|
|
||||||
<html:tr>
|
|
||||||
<html:td>
|
|
||||||
<html:input name="autosave" type="checkbox" id="editorPublishKeepLinks"
|
|
||||||
pref="true" preftype="bool" prefstring="editor.publish_keep_links"/>
|
|
||||||
<html:label for="editorPublishKeepLinks">&keepCheck.label;</html:label>
|
|
||||||
<html:br />&saveDesc.label;
|
|
||||||
</html:td>
|
|
||||||
</html:tr>
|
|
||||||
&tip.label;
|
|
||||||
</html:table>
|
|
||||||
&defaultHeader.label;
|
|
||||||
<html:table>
|
|
||||||
<html:tr>
|
|
||||||
<html:td>&publishFtp.label;</html:td>
|
|
||||||
</html:tr>
|
|
||||||
<html:tr>
|
|
||||||
<html:td>
|
|
||||||
<html:input name="autosave" type="text" id="composerPublish"
|
|
||||||
pref="true" preftype="string" prefstring="composer.publish" size="30"/>
|
|
||||||
</html:td>
|
|
||||||
</html:tr>
|
|
||||||
<html:tr>
|
|
||||||
<html:td>&publishhtp.label;</html:td>
|
|
||||||
</html:tr>
|
|
||||||
<html:tr>
|
|
||||||
<html:td>
|
|
||||||
<html:input name="autosave" type="text" id="composerBrowse"
|
|
||||||
pref="true" preftype="string" prefstring="composer.browse" size="30"/>
|
|
||||||
</html:td>
|
|
||||||
</html:tr>
|
|
||||||
</html:table>
|
|
||||||
</html:div>
|
|
||||||
</page>
|
|
|
@ -1,21 +0,0 @@
|
||||||
<!-- extracted from content/pref-publish.xul -->
|
|
||||||
|
|
||||||
<!--LOCALIZATION NOTE : FILE The Publish preferences screen -->
|
|
||||||
<!ENTITY pref.publish.title "Publish">
|
|
||||||
<!ENTITY composerHeader.label "Publish">
|
|
||||||
<!ENTITY maintainCheckbox.label "Maintain links">
|
|
||||||
<!ENTITY keepCheck.label "Keep images with page">
|
|
||||||
|
|
||||||
<!--LOCALIZATION NOTE (adjustDesc.label): Attempt to maintain approximate line length, linefeeds and white space -->
|
|
||||||
<!ENTITY adjustDesc.label "Adjust links to work from the page's location. (Links to local pages will work when
|
|
||||||
local versions exist.) ">
|
|
||||||
<!--LOCALIZATION NOTE (saveDesc.label): Attempt to maintain approximate line length, linefeeds and white space -->
|
|
||||||
<!ENTITY saveDesc.label "Save copies of images to the page's location. Images will always
|
|
||||||
appear in local versions of the page and when the page is published.">
|
|
||||||
<!ENTITY tip.label "Tip: Check both options if you will be using remote publishing.">
|
|
||||||
<!ENTITY defaultHeader.label "Default publishing location">
|
|
||||||
<!--LOCALIZATION NOTE (publishFtp.label): Edit box appears beside this label -->
|
|
||||||
<!ENTITY publishFtp.label "If publishing to a FTP site, enter the HTTP address to browse to:">
|
|
||||||
<!--LOCALIZATION NOTE (publishhtp.label): Edit box appears beside this label -->
|
|
||||||
<!ENTITY publishhtp.label "If publishing to a FTP site, enter the HTTP address to browse to:">
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче