Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backing out changes to files accidentally checked in!

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@121738 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cmanske%netscape.com
2002-05-17 03:39:21 +00:00
parent 81426be033
commit 4d019d22a4
7 changed files with 45 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/editor/ui/dialogs/content/EdLinkChecker.xul
View File

@@ -19,7 +19,6 @@
- Rights Reserved.
-
- Contributor(s):
- Charles Manske (cmanske@netscape.com)
-->
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
@@ -45,15 +44,16 @@
<spacer id="location" offsetY="50" persist="offsetX offsetY"/>
<broadcaster id="args" value=""/>
<listbox rows="8" id="LinksList" class="MinWidth20" flex="1"/>
<hbox align="center">
<spacer class="bigspacer"/>
<image class="progressitem" progress="done"/>
<label value="&succeeded.label;"/>
<spacer class="bigspacer"/>
<spacer class="bigspacer"/>
<image class="progressitem" progress="failed"/>
<label value="&failed.label;"/>
</hbox>
<separator class="groove"/>
<label value="&urlsNotFound.label;"/>
<label value="&notFoundKey.label;"/>
<tree id="NamedAnchorList" hidecolumnpicker="true"
style="min-height: 8em; min-width: 20em">
<treecols>
<treecol id="AnchorCol1" hideheader="true"/>
<treecol id="AnchorCol2" flex="1" hideheader="true"/>
</treecols>
<treechildren/>
</tree>
<spacer class="spacer"/>
<button id="ChangeURL" label="&changeUrlButton.label;" oncommand="ChangeUrl();"/>
</dialog>

16
mozilla/editor/ui/dialogs/content/EdListProps.js
View File

@@ -60,14 +60,16 @@ function Startup()
if (ListElement)
globalElement = ListElement.cloneNode(false);
// Radio button index is persistent
if (ListElement && gDialog.RadioGroup.getAttribute("index") == "1")
gDialog.RadioGroup.selectedItem = gDialog.ChangeSelectedRadio;
else
gDialog.RadioGroup.selectedItem = gDialog.ChangeAllRadio;
// Show extra options for changing entire list only if we already have a list
// Show extra options for changing entire list if we have one already.
gDialog.RadioGroup.setAttribute("collapsed", ListElement ? "false" : "true");
if (ListElement)
{
// Radio button index is persistant
if (gDialog.RadioGroup.getAttribute("index") == "1")
gDialog.RadioGroup.selectedItem = gDialog.ChangeSelectedRadio;
else
gDialog.RadioGroup.selectedItem = gDialog.ChangeAllRadio;
}
InitDialog();

7
mozilla/editor/ui/dialogs/content/EdListProps.xul
View File

@@ -18,9 +18,7 @@
- Copyright (C) 1998-1999 Netscape Communications Corporation. All
- Rights Reserved.
-
- Contributor(s):
- Charles Manske (cmanske@netscape.com)
- Ryan Cassin (rcassin@supernova.org)
- Contributor(s):
-->
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
@@ -66,9 +64,10 @@
<hbox>
<label id="StartingNumberLabel" control="StartingNumber"
value="&startingNumber.label;" accesskey="&startingNumber.accessKey;"/>
<textbox class="narrow" id="StartingNumber"/>
<textbox class="narrow" id="StartingNumber" oninput="forceInteger(this.id)"/>
<spacer/>
</hbox>
<description id="StartExample" class="wrap" flex="1" style="width: 1em">&startingHelp.label;</description>
</groupbox>
<radiogroup id="RadioGroup" index="0" persist="index">
<radio id="ChangeAll" label="&changeEntireListRadio.label;" accesskey="&changeEntireListRadio.accessKey;"/>

6
mozilla/editor/ui/dialogs/content/EditorPublish.js
View File

@@ -159,7 +159,7 @@ function Startup()
} catch (e) {}
gDialog.PageTitleInput.value = gPreviousTitle;
gDialog.FilenameInput.value = filename;
gDialog.FilenameInput.value = unescape(filename);
if (!addNewSite)
{
@@ -188,8 +188,6 @@ function Startup()
gDialog.OtherDirRadiogroup.selectedItem = gDialog.UseSubdirRadio;
}
gDialog.PublishUrlInput.setAttribute("tooltiptext", "The FTP:// or HTTP:// address provided by\nyour ISP or web hosting service");
doEnabling();
SetWindowLocation();
@@ -398,8 +396,6 @@ function ValidateSettings()
}
// Extract username and password while removing them from publishingUrl
/// XXX Problem: If username contains "@", StripUsernamePassword will not
// extract the username correctly
var urlUserObj = {};
var urlPassObj = {};
var publishUrl = StripUsernamePassword(gDialog.PublishUrlInput.value, urlUserObj, urlPassObj);

36
mozilla/editor/ui/dialogs/content/EditorPublish.xul
View File

@@ -30,7 +30,6 @@
<!DOCTYPE window SYSTEM "chrome://editor/locale/EditorPublish.dtd">
<dialog title="&windowTitle.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="Startup()"
@@ -50,14 +49,6 @@
<spacer id="location" offsetY="50" persist="offsetX offsetY"/>
<broadcaster id="args" value=""/>
<popupset id="tooltipSet">
<tooltip id="publishTooltip" noautohide="true">
<description width="200">
&siteNameTip.label;
</description>
</tooltip>
</popupset>
<tabbox>
<tabs flex="1">
<tab id="PublishTab" oncommand="SelectPublishTab()" label="&publishTab.label;"/>
@@ -71,36 +62,31 @@
<columns><column/><column/><column/></columns>
<rows>
<row align="center">
<label value="&siteName.label;"
accesskey="&siteNameList.accessKey;" control="SiteList"/>
<label value="&siteList.label;"/>
<!-- Contents filled in at runtime -->
<menulist id="SiteList"
style="min-width:18em; max-width:18em;" crop="right"
oncommand="SelectSiteList();"/>
<hbox>
<button label="&newSiteButton.label;"
accesskey="&newSiteButton.accessKey;" oncommand="AddNewSite();"/>
<button label="&newSiteButton.label;" oncommand="AddNewSite();"/>
<spacer flex="1"/>
</hbox>
</row>
<spacer class="spacer"/>
<row align="center">
<label value="&pageTitle.label;"
accesskey="&pageTitle.accessKey;" control="PageTitleInput"/>
<label value="&pageTitle.label;"/>
<textbox id="PageTitleInput" class="minWidth15"/>
<label value="&pageTitleExample.label;"/>
</row>
<row align="center">
<label value="&filename.label;"
accesskey="&filename.accessKey;" control="FilenameInput"/>
<label value="&filename.label;"/>
<textbox id="FilenameInput" class="minWidth15"/>
<label value="&filenameExample.label;"/>
</row>
</rows>
</grid>
<spacer class="spacer"/>
<label value="&docDirList.label;"
accesskey="&docDirList.accessKey;" control="DocDirList"/>
<label value="&docDirList.label;"/>
<hbox align="center">
<!-- Contents filled in at runtime -->
<menulist id="DocDirList" class="minWidth20" editable="true" flex="1"
@@ -112,20 +98,17 @@
<spacer class="spacer"/>
<groupbox>
<caption>
<checkbox id="OtherDirCheckbox" label="&publishImgCheckbox.label;"
accesskey="&publishImgCheckbox.accessKey;" oncommand="doEnabling();"/>
<checkbox id="OtherDirCheckbox" label="&publishImgCheckbox.label;" oncommand="doEnabling();"/>
</caption>
<vbox>
<radiogroup id="OtherDirRadiogroup">
<hbox>
<spacer class="checkbox-spacer"/>
<radio id="SameLocationRadio" label="&sameLocationRadio.label;"
accesskey="&sameLocationRadio.accessKey;" oncommand="doEnabling();"/>
<radio id="SameLocationRadio" label="&sameLocationRadio.label;" oncommand="doEnabling();"/>
</hbox>
<hbox>
<spacer class="checkbox-spacer"/>
<radio id="UseSubdirRadio" label="&useSubdirRadio.label;"
accesskey="&useSubdirRadio.accessKey;" oncommand="doEnabling();"/>
<radio id="UseSubdirRadio" label="&useSubdirRadio.label;" oncommand="doEnabling();"/>
</hbox>
</radiogroup>
</vbox>
@@ -136,8 +119,7 @@
<menulist id="OtherDirList" class="minWidth20" editable="true" flex="1"
oninput="onInputSettings();"/>
<!--
<button label="&chooseDirButton.label;"
accesskey="&chooseDirButton.accessKey;" oncommand="ChooseDir(gDialog.OtherDirList);" disabled="true"/>
<button label="&chooseDirButton.label;" oncommand="ChooseDir(gDialog.OtherDirList);" disabled="true"/>
-->
</hbox>
</groupbox>

22
mozilla/editor/ui/dialogs/content/EditorPublishOverlay.xul
View File

@@ -34,19 +34,14 @@
<groupbox id="ServerSettingsBox">
<caption label="&serverInfo.label;"/>
<hbox align="center">
<label value="&siteName.label;"
accesskey="&siteName.accessKey;" control="SiteNameInput"/>
<textbox id="SiteNameInput" class="MinWidth20em"
oninput="onInputSettings();" flex="1"
tooltip="publishTooltip" />
<label value="&siteName.label;"/>
<textbox id="SiteNameInput" class="MinWidth20em" oninput="onInputSettings();" flex="1"/>
</hbox>
<spacer class="spacer"/>
<label value="&siteUrl.label;"
accesskey="&siteUrl.accessKey;" control="PublishUrlInput"/>
<label value="&siteUrl.label;"/>
<textbox id="PublishUrlInput" class="MinWidth20em" oninput="onInputSettings();"/>
<spacer class="spacer"/>
<label value="&browseUrl.label;"
accesskey="&browseUrl.accessKey;" control="BrowseUrlInput"/>
<label value="&browseUrl.label;"/>
<textbox id="BrowseUrlInput" class="MinWidth20em" oninput="onInputSettings();"/>
<spacer class="spacer"/>
</groupbox>
@@ -56,17 +51,14 @@
<columns><column flex="1"/><column flex="3"/></columns>
<rows>
<row align="center">
<label value="&username.label;"
accesskey="&username.accessKey;" control="UsernameInput"/>
<label value="&username.label;"/>
<textbox id="UsernameInput" class="MinWidth10em" flex="1" oninput="onInputSettings();"/>
</row>
<row align="center">
<label value="&password.label;"
accesskey="&password.accessKey;" control="PasswordInput"/>
<label value="&password.label;"/>
<hbox>
<textbox id="PasswordInput" type="password" class="MinWidth5em" oninput="onInputSettings();"/>
<checkbox id="SavePassword" label="&savePassword.label;"
accesskey="&savePassword.accessKey;" oncommand="onInputSettings();"/>
<checkbox id="SavePassword" label="&savePassword.label;" oncommand="onInputSettings();"/>
</hbox>
</row>
</rows>

14
mozilla/editor/ui/dialogs/content/EditorPublishSettings.xul
View File

@@ -51,22 +51,16 @@
<hbox id="SettingsPanel">
<groupbox align="center">
<caption>
<label value="&publishSites.label;"
accesskey="&siteNameList.accessKey;" control="SiteList"/>
</caption>
<caption label="&publishSites.label;"/>
<!-- XXX: If tree isn't wrapped in vbox, it appears BELOW next vbox -->
<vbox flex="1">
<listbox rows="4" id="SiteList" flex="1" onselect="SelectSiteList();"/>
</vbox>
<hbox pack="center">
<vbox>
<button id="NewSiteButton" label="&newSiteButton.label;"
accesskey="&newSiteButton.accessKey;" oncommand="AddNewSite();"/>
<button id="SetDefaultButton" label="&setDefaultButton.label;"
accesskey="&setDefaultButton.accessKey;" oncommand="SetDefault();"/>
<button id="RemoveSiteButton" label="&removeButton.label;"
accesskey="&removeButton.accessKey;" oncommand="RemoveSite();"/>
<button id="NewSiteButton" label="&newSiteButton.label;" oncommand="AddNewSite();"/>
<button id="SetDefaultButton" label="&setDefaultButton.label;" oncommand="SetDefault();"/>
<button id="RemoveSiteButton" label="&removeButton.label;" oncommand="RemoveSite();"/>
</vbox>
</hbox>
</groupbox>