From 28dc46ae746d3f31807f027713a49035e6a10eae Mon Sep 17 00:00:00 2001
From: "cmanske%netscape.com"
 <cmanske%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 11 Aug 2000 03:20:47 +0000
Subject: [PATCH] More editor UI bug fixes: 47653, 47688, 47693, 47687.
 r=sfraser

git-svn-id: svn://10.0.0.236/trunk@76083 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../ui/composer/content/ComposerCommands.js   |   1 -
 mozilla/editor/ui/composer/content/editor.js  |  81 +++-------
 mozilla/editor/ui/composer/content/editor.xul |   2 +-
 .../ui/composer/locale/en-US/editor.dtd       |   2 +-
 .../composer/locale/en-US/pref-composer.dtd   |   4 +-
 .../ui/dialogs/content/EdDialogCommon.js      |   2 +-
 .../ui/dialogs/content/EdInsertTable.js       |  17 ++-
 .../ui/dialogs/content/EdInsertTable.xul      |   4 +-
 .../editor/ui/dialogs/content/EdLinkProps.js  |  34 +++--
 .../editor/ui/dialogs/content/EdLinkProps.xul |   6 +-
 .../ui/dialogs/content/EdNamedAnchorProps.js  |  17 ++-
 .../ui/dialogs/content/EdNamedAnchorProps.xul |   4 +-
 .../editor/ui/dialogs/content/EdPageProps.js  |  10 +-
 .../editor/ui/dialogs/content/EdTableProps.js | 141 +++++++-----------
 .../ui/dialogs/content/EdTableProps.xul       |  12 +-
 .../locale/en-US/EdNamedAnchorProperties.dtd  |   1 -
 .../locale/en-US/EditorColorProperties.dtd    |   2 +-
 .../locale/en-US/EditorLinkProperties.dtd     |   3 +-
 .../locale/en-US/EditorPageProperties.dtd     |   2 +-
 .../locale/en-US/EditorSaveAsCharset.dtd      |   2 +-
 .../locale/en-US/EditorTableProperties.dtd    |   5 +-
 21 files changed, 167 insertions(+), 185 deletions(-)

diff --git a/mozilla/editor/ui/composer/content/ComposerCommands.js b/mozilla/editor/ui/composer/content/ComposerCommands.js
index 660ed7956a9..c9b4f57c1eb 100644
--- a/mozilla/editor/ui/composer/content/ComposerCommands.js
+++ b/mozilla/editor/ui/composer/content/ComposerCommands.js
@@ -725,7 +725,6 @@ var nsObjectPropertiesCommand =
                element.nodeName == "table" ||
                element.nodeName == "td"    ||
                element.nodeName == "a"))
-//               window.editorShell.GetSelectedElement("href")));
     }
     return false;
   },
diff --git a/mozilla/editor/ui/composer/content/editor.js b/mozilla/editor/ui/composer/content/editor.js
index 12dc583fea8..55a0736a913 100644
--- a/mozilla/editor/ui/composer/content/editor.js
+++ b/mozilla/editor/ui/composer/content/editor.js
@@ -893,28 +893,7 @@ function SetDisplayMode(mode)
       // Switch to the sourceWindow (second in the deck)
       gContentWindowDeck.setAttribute("index","1");
 
-      // Hide menus that are completely disabled
-      // Note: ShowMenuItem is implemented in EditorContextMenu.js
-      CollapseItem("editMenu", true);
-      CollapseItem("insertMenu", true);
-      CollapseItem("formatMenu", true);
-      CollapseItem("tableMenu", true);
-
-      // Collapse allitems in the view menu except mode switch items
-      SetViewMenuForHTMLSource(true);
-
-      DisableItem("viewToolbar", true);
-      DisableItem("viewSep1", true);
-      DisableItem("viewSep1", true);
-      DisableItem("composerCharsetMenu", true);
-
-      DisableItem("findButton", true);
-      DisableItem("spellingButton", true);
-      DisableItem("imageButton", true);
-      DisableItem("hlineButton", true);
-      DisableItem("tableButton", true);
-      DisableItem("linkButton", true);
-      DisableItem("namedAnchorButton", true);
+      DisableMenusForHTMLSource(true);
 
       //Hide the formating toolbar if not already hidden
       gFormatToolbarHidden = gFormatToolbar.getAttribute("hidden");
@@ -931,20 +910,7 @@ function SetDisplayMode(mode)
       gContentWindowDeck.setAttribute("index","0");
 
       // Restore menus and toolbars
-      CollapseItem("editMenu", false);
-      CollapseItem("insertMenu", false);
-      CollapseItem("formatMenu", false);
-      CollapseItem("tableMenu", false);
-
-      SetViewMenuForHTMLSource(false);
-
-      DisableItem("findButton", false);
-      DisableItem("spellingButton", false);
-      DisableItem("imageButton", false);
-      DisableItem("hlineButton", false);
-      DisableItem("tableButton", false);
-      DisableItem("linkButton", false);
-      DisableItem("namedAnchorButton", false);
+      DisableMenusForHTMLSource(false);
 
       if (gFormatToolbarHidden != "true")
       {
@@ -959,8 +925,28 @@ dump("Switching back to visible toolbar. gFormatToolbarHidden = "+gFormatToolbar
 }
 
 // We disable all items in View menu except Edit mode and sidebar items
-function SetViewMenuForHTMLSource(disable)
+function DisableMenusForHTMLSource(disable)
 {
+  // Disable toolbar buttons
+  DisableItem("findButton", disable);
+  DisableItem("spellingButton", disable);
+  DisableItem("imageButton", disable);
+  DisableItem("hlineButton", disable);
+  DisableItem("tableButton", disable);
+  DisableItem("linkButton", disable);
+  DisableItem("namedAnchorButton", disable);
+
+  // Top-level menus that we completely hide
+  CollapseItem("insertMenu", disable);
+  CollapseItem("formatMenu", disable);
+  CollapseItem("tableMenu", disable);
+
+  // Edit menu items
+  DisableItem("menu_find", disable);
+  DisableItem("menu_findnext", disable);
+  DisableItem("menu_checkspelling", disable);
+
+  // Disable all items in the view menu except mode switch items
   var viewMenu = document.getElementById("viewMenu");
   // menuitems are children of the menupopup child
   var children = viewMenu.firstChild.childNodes;
@@ -978,27 +964,6 @@ function SetViewMenuForHTMLSource(disable)
   }
 }
 
-function DisableMenuItem(id, disable)
-{
-dump("DisableMenuItem: item id="+id+": "+disable+"\n");
-  var item = document.getElementById(id);
-  if (item)
-  {
-	  if(disable != (item.getAttribute("disabled") == true))
-    {
-		  if (disable)
-        item.setAttribute("disabled", disable);
-      else
-      {
-dump("Remove disable\n");
-        item.removeAttribute("disabled");
-      }
-    }
-  }
-  else
-    dump("DisableMenuItem: item id="+id+" not found\n");
-}
-
 function EditorToggleParagraphMarks()
 {
   var menuItem = document.getElementById("viewParagraphMarks");
diff --git a/mozilla/editor/ui/composer/content/editor.xul b/mozilla/editor/ui/composer/content/editor.xul
index e6170ff9d52..661f2580d62 100644
--- a/mozilla/editor/ui/composer/content/editor.xul
+++ b/mozilla/editor/ui/composer/content/editor.xul
@@ -154,7 +154,7 @@
     <button id="previewButton"/>
     <menubutton id="printButton" />
     <button id="spellingButton"/>
-    <spring class="separator_small"/>
+    <spring style="width: 8px"/>
     <button id="imageButton"/>
     <button id="hlineButton"/>
     <button id="tableButton"/>
diff --git a/mozilla/editor/ui/composer/locale/en-US/editor.dtd b/mozilla/editor/ui/composer/locale/en-US/editor.dtd
index adb386c5eac..9787ced343c 100644
--- a/mozilla/editor/ui/composer/locale/en-US/editor.dtd
+++ b/mozilla/editor/ui/composer/locale/en-US/editor.dtd
@@ -45,5 +45,5 @@
 <!-- Display Mode Toolbar -->
 <!ENTITY editMode.label "Edit Mode:">
 
-<!ENTITY statusText.label "Document: Done">
+<!ENTITY statusText.label "Done loading page">
 
diff --git a/mozilla/editor/ui/composer/locale/en-US/pref-composer.dtd b/mozilla/editor/ui/composer/locale/en-US/pref-composer.dtd
index d2e195209e0..4b9599ea791 100644
--- a/mozilla/editor/ui/composer/locale/en-US/pref-composer.dtd
+++ b/mozilla/editor/ui/composer/locale/en-US/pref-composer.dtd
@@ -22,7 +22,7 @@
 
 <!ENTITY  savingFiles.title           "When Saving Files">
 <!ENTITY  preserveExistingFormatting  "Retain HTML framework">
-<!ENTITY  preserveExistingFormatting.tooltip    "Preserves line breaks and document's original structure ">
+<!ENTITY  preserveExistingFormatting.tooltip    "Preserves line breaks and page's original structure ">
 
 <!ENTITY  saving                    "Saving">
 <!ENTITY  AutoSaveCheck             "Automatically save every">
@@ -34,4 +34,4 @@
 <!ENTITY  chooseButton.label        "Choose">
 
 <!ENTITY  recentFiles.title         "Recent Pages Menu">
-<!ENTITY  documentsInMenu           "Max number of documents listed:">
+<!ENTITY  documentsInMenu           "Max number of pages listed:">
diff --git a/mozilla/editor/ui/dialogs/content/EdDialogCommon.js b/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
index 35f2493b8a2..8af9a1a5ea4 100644
--- a/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
+++ b/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
@@ -183,7 +183,7 @@ function ReplaceWhitespace(string, charReplace) {
 // Replace whitespace with "_" and allow only "word" characters (a-z,A-Z,0-9 and _)
 function PrepareStringForURL(string)
 {
-  return ReplaceWhitespace(string,"_").replace(/\W+/g,'')
+  return ReplaceWhitespace(string,"_").replace(/\W+/g,'');
 }
 
 // this function takes an elementID and a flag
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertTable.js b/mozilla/editor/ui/dialogs/content/EdInsertTable.js
index 03157766f85..11affbff97c 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertTable.js
+++ b/mozilla/editor/ui/dialogs/content/EdInsertTable.js
@@ -76,10 +76,10 @@ function Startup()
     dialog.widthPixelOrPercentMenulist.selectedIndex = 1;
   }
 
-  dialog.rowsInput.focus();
-
   // Resize window
   window.sizeToContent();
+
+  SetTextfieldFocus(dialog.rowsInput);
 }
 
 // Set dialog widgets with attribute data
@@ -95,6 +95,19 @@ function InitDialog()
   dialog.borderInput.value = globalElement.getAttribute("border");
 }
 
+function ChangeRowOrColumn(id)
+{
+  // Allow only integers
+  forceInteger(id);
+
+  // Enable OK only if both rows and columns have a value > 0
+  SetElementEnabledById("ok", dialog.rowsInput.value.length > 0 && 
+                              dialog.rowsInput.value > 0 &&
+                              dialog.columnsInput.value.length > 0 &&
+                              dialog.columnsInput.value > 0);
+}
+
+
 // Get and validate data from widgets.
 // Set attributes on globalElement so they can be accessed by AdvancedEdit()
 function ValidateData()
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
index 6eb6e6bace9..73952fed5b8 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
@@ -53,12 +53,12 @@
       <rows>
         <row valign="middle" text-align="right" autostretch="never">
           <text class="label align-right" text-align="right" value="&numRowsEditField.label;" />
-          <textfield class="narrow" id="rowsInput" onkeyup="forceInteger(this.id)" />
+          <textfield class="narrow" id="rowsInput" onkeyup="ChangeRowOrColumn(this.id)" />
           <spring/>
         </row>
         <row valign="middle" text-align="right" autostretch="never">
           <text class="label align-right" value="&numColumnsEditField.label;" />
-          <textfield class="narrow" id="columnsInput" onkeyup="forceInteger(this.id)" />
+          <textfield class="narrow" id="columnsInput" onkeyup="ChangeRowOrColumn(this.id)" />
           <spring/>
         </row>
         <row valign="middle" text-align="right" autostretch="never">
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.js b/mozilla/editor/ui/dialogs/content/EdLinkProps.js
index 73d9e07cf40..4b7198e4fac 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.js
@@ -23,6 +23,7 @@
 var anchorElement = null;
 var imageElement = null;
 var insertNew = false;
+var replaceExistingLink = false;
 var insertLinkAtCaret;
 var needLinkText = false;
 var href;
@@ -62,7 +63,6 @@ function Startup()
   dialog.MoreSection         = document.getElementById("MoreSection");
   dialog.MoreFewerButton     = document.getElementById("MoreFewerButton");
   dialog.AdvancedEditSection = document.getElementById("AdvancedEdit");
-  dialog.ok                  = document.getElementById("ok");
 
   var selection = editorShell.editorSelection;
   if (selection)
@@ -86,7 +86,8 @@ dump("Selected imageElement="+imageElement+"\n");
         //  this image away by inserting a new link around it,
         //  so make a new node and copy existing attributes
         anchorElement = anchorElement.cloneNode(false);
-        insertNew = true;
+        //insertNew = true;
+        replaceExistingLink = true;
       }
     }
   }
@@ -122,7 +123,8 @@ dump("Selected element="+anchorElement+"\n");
         // But clone it for reinserting/merging around existing
         //   link that only partially overlaps the selection
         anchorElement = anchorElement.cloneNode(false);
-        insertNew = true;
+        //insertNew = true;
+        replaceExistingLink = true;
       }
     }
   }
@@ -132,6 +134,8 @@ dump("Selected element="+anchorElement+"\n");
     // No existing link -- create a new one
     anchorElement = editorShell.CreateElementWithDefaults(tagName);
     insertNew = true;
+    // Hide message about removing existing link
+    document.getElementById("RemoveLinkMsg").setAttribute("hidden","true");
   }
   if(!anchorElement)
   {
@@ -148,9 +152,6 @@ dump("Selected element="+anchorElement+"\n");
     dialog.linkTextCaption.setAttribute("value",GetString("LinkText"));
     // Message above input field:
     dialog.linkTextMessage.setAttribute("value", GetString("EnterLinkText"));
-    
-    // This sets enable state on OK button
-    ChangeText();
   }
   else
   {
@@ -217,7 +218,11 @@ dump("Selected element="+anchorElement+"\n");
     dialog.linkTextInput.setAttribute("hidden","true");
     dialog.linkTextInput = null;
   }
+
   InitMoreFewer();
+    
+  // This sets enable state on OK button
+  ChangeText();
 }
 
 // Set dialog widgets with attribute data
@@ -308,10 +313,16 @@ function FillListboxes()
 
 function ChangeText()
 {
-  if (insertLinkAtCaret)
+  // Set OK button enable state only if inserting a new link
+  // (allow empty location to remove existing link)
+  if (insertNew)
   {
-    var text = dialog.linkTextInput.value.trimString();
-    SetElementEnabledById( "ok", (text.length > 0));
+    var enable = true;
+    if (insertLinkAtCaret)
+      enable = dialog.linkTextInput.value.trimString().length > 0;
+    if (enable)
+      enable = dialog.hrefInput.value.trimString().length > 0;
+    SetElementEnabledById( "ok", enable);
   }
 }
 
@@ -320,6 +331,9 @@ function ChangeLocation()
   // Unselect the treelists
   UnselectNamedAnchor();
   UnselectHeadings();
+  
+  // Set OK button enable state
+  ChangeText();
 }
 
 function GetExistingHeadingIndex(text)
@@ -435,7 +449,7 @@ function onOK()
           dump("Exception occured in InsertElementAtSelection\n");
           return true;
         }
-      } else if (insertNew)
+      } else if (insertNew || replaceExistingLink)
       {
         //  Link source was supplied by the selection,
         //  so insert a link node as parent of this
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
index 3d700617a59..1229d640b9c 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
@@ -48,7 +48,7 @@
   <box orient="vertical" style="min-width: 20em">
     <titledbox orient="vertical"><title><text id="linkTextCaption" align="left"/></title>
       <text class="label" id="linkTextMessage"/> 
-	    <textfield id="linkTextInput" flex="1"  onkeyup="ChangeText()"/>
+	    <textfield id="linkTextInput" flex="1" onkeyup="ChangeText()"/>
     </titledbox>
 
     <titledbox orient="vertical"><title><text class="label" value="&LinkURLBox.label;"/></title>
@@ -57,11 +57,13 @@
         <textfield id="hrefInput" flex="1" style="min-width: 18em" onkeyup="ChangeLocation()"/>
         <button class="dialog" id="ChooseFile" flex="1"/>
       </box>
+      <html class="wrap" flex="1" id="RemoveLinkMsg" style="margin-bottom: 7px">&RemoveLinkMsg.label;</html>
       <box autostretch="never">
         <button class="dialog" id="MoreFewerButton" align="left" oncommand="onMoreFewer()" persist="more"/>
       </box>
+      <spring class="spacer"/>
       <box id="MoreSection" orient="vertical">
-        <spring class="bigspacer"/>
+        <spring class="spacer"/>
         <text class="label" align="left" value="&NamedAnchorMsg.label;"/>
         <tree rows="4" class="list" id="NamedAnchorList" onselect="SelectNamedAnchor()" onclick="SelectNamedAnchor()">
           <treecolgroup><treecol flex="1"/></treecolgroup>
diff --git a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js
index c0dfa6aaa10..5b5ff2919be 100644
--- a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js
@@ -85,6 +85,17 @@ function InitDialog()
   nameInput.value = globalElement.getAttribute("name");
 }
 
+function ChangeName()
+{
+  if (nameInput.value.length > 0)
+  {
+    // Replace spaces with "_" and strip other non-URL characters
+    // Note: we could use ConvertAndEscape, but then we'd
+    //  have to UnConverAndEscape beforehand - too messy!
+    nameInput.value = PrepareStringForURL(nameInput.value.replace(/\s+/g, "_"));
+  }
+}
+
 function AnchorNameExists(name)
 {
   anchorList = editorShell.editorDocument.anchors;
@@ -102,7 +113,8 @@ function AnchorNameExists(name)
 function ValidateData()
 {
   var name = TrimString(nameInput.value);
-  if (name.length == 0) {
+  if (name.length == 0)
+  {
       ShowInputErrorMessage(GetString("MissingAnchorNameError"));
       SetTextfieldFocus(nameInput);
       return false;
@@ -112,7 +124,8 @@ function ValidateData()
     //  have to UnConverAndEscape beforehand - too messy!
     name = PrepareStringForURL(name);
 
-    if (AnchorNameExists(name)) {
+    if (AnchorNameExists(name))
+    {
       ShowInputErrorMessage(GetString("DuplicateAnchorNameError").replace(/%name%/,name));            
       SetTextfieldFocus(nameInput);
       return false;
diff --git a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
index 7a1f2dc52a6..acf0d801b8f 100644
--- a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
@@ -48,8 +48,8 @@
   <popupset id="aTooltipSet" />
 
   <text class="label" align="left" for="nameInput" value="&anchorNameEditField.label;"/>
-  <textfield class="MinWidth20em" id="nameInput" tooltip="aTooltip" tooltiptext="&nameInput.tooltip;"/>
-  <text class="label" align="left" value="&noSpacesMsg.label;"/>
+  <textfield class="MinWidth20em" id="nameInput" onkeyup="ChangeName()" 
+             tooltip="aTooltip" tooltiptext="&nameInput.tooltip;"/>
   <spring class="spacer"/>
   <!-- from EdDialogOverlay -->
   <box id="AdvancedEdit"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdPageProps.js b/mozilla/editor/ui/dialogs/content/EdPageProps.js
index 5929e47415e..8b7ec9fd64f 100644
--- a/mozilla/editor/ui/dialogs/content/EdPageProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdPageProps.js
@@ -95,7 +95,15 @@ function Startup()
 function InitDialog()
 {
   dialog.TitleInput.value = editorShell.GetDocumentTitle();
-  dialog.AuthorInput.value = authorElement.getAttribute("content");
+  var author = authorElement.getAttribute("content").trimString();
+  if (author.length == 0)
+  {
+    // Fill in with value from editor prefs
+    var prefs = GetPrefs();
+    if (prefs) 
+      author = prefs.CopyCharPref("editor.author");
+  }
+  dialog.AuthorInput.value = author;
   dialog.DescriptionInput.value = descriptionElement.getAttribute("content");
 }
 
diff --git a/mozilla/editor/ui/dialogs/content/EdTableProps.js b/mozilla/editor/ui/dialogs/content/EdTableProps.js
index 542ff43ab59..4323f211ca8 100644
--- a/mozilla/editor/ui/dialogs/content/EdTableProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdTableProps.js
@@ -107,17 +107,6 @@ function Startup()
   dialog.TableCaptionList = document.getElementById("TableCaptionList");
   dialog.TableInheritColor = document.getElementById("TableInheritColor");
 
-  dialog.RowsCheckbox = document.getElementById("RowsCheckbox");
-  dialog.ColumnsCheckbox = document.getElementById("ColumnsCheckbox");
-  dialog.TableHeightCheckbox = document.getElementById("TableHeightCheckbox");
-  dialog.TableWidthCheckbox = document.getElementById("TableWidthCheckbox");
-  dialog.TableBorderCheckbox = document.getElementById("TableBorderCheckbox");
-  dialog.CellSpacingCheckbox = document.getElementById("CellSpacingCheckbox");
-  dialog.CellPaddingCheckbox = document.getElementById("CellPaddingCheckbox");
-  dialog.TableHAlignCheckbox = document.getElementById("TableHAlignCheckbox");
-  dialog.TableCaptionCheckbox = document.getElementById("TableCaptionCheckbox");
-  dialog.TableColorCheckbox = document.getElementById("TableColorCheckbox");
-
   // Cell Panel
   dialog.SelectionList = document.getElementById("SelectionList");
   dialog.PreviousButton = document.getElementById("PreviousButton");
@@ -146,7 +135,6 @@ function Startup()
   dialog.CellVAlignCheckbox = document.getElementById("CellVAlignCheckbox");
   dialog.CellStyleCheckbox = document.getElementById("CellStyleCheckbox");
   dialog.TextWrapCheckbox = document.getElementById("TextWrapCheckbox");
-  dialog.CellColorCheckbox = document.getElementById("CellColorCheckbox");
 
   TabPanel = document.getElementById("TabPanel");
   var TableTab = document.getElementById("TableTab");
@@ -900,9 +888,11 @@ function ValidateData()
 //   so the checkbox is automatically set
 function SetCheckbox(checkboxID)
 {
-  // Set associated checkbox
-  document.getElementById(checkboxID).checked = true;
-
+  if (checkboxID && checkboxID.length > 0)
+  {
+    // Set associated checkbox
+    document.getElementById(checkboxID).checked = true;
+  }
   if (currentPanel == CellPanel)
     CellDataChanged = true;
 }
@@ -941,55 +931,52 @@ function ConfirmDeleteCells()
 
 function ApplyTableAttributes()
 {
-  if (dialog.TableCaptionCheckbox.checked)
-  {
-    var newAlign = dialog.TableCaptionList.selectedItem.data;
-    if (!newAlign) newAlign = "";
+  var newAlign = dialog.TableCaptionList.selectedItem.data;
+  if (!newAlign) newAlign = "";
 
+  if (TableCaptionElement)
+  {
+    // Get current alignment
+    var align = TableCaptionElement.align.toLowerCase();
+    // This is the default
+    if (!align) align = "top";
+
+    if (newAlign == "")
+    {
+      // Remove existing caption
+      editorShell.DeleteElement(TableCaptionElement);
+      TableCaptionElement = null;
+    } 
+    else if( align != newAlign)
+    {
+      if (align == "top") // This is default, so don't explicitly set it
+        editorShell.RemoveAttribute(TableCaptionElement, "align");
+      else
+        editorShell.SetAttribute(TableCaptionElement, "align", newAlign);
+    }
+  } 
+  else if (newAlign != "")
+  {
+    // Create and insert a caption:
+    TableCaptionElement = editorShell.CreateElementWithDefaults("caption");
     if (TableCaptionElement)
     {
-      // Get current alignment
-      var align = TableCaptionElement.align.toLowerCase();
-      // This is the default
-      if (!align) align = "top";
-
-      if (newAlign == "")
-      {
-        // Remove existing caption
-        editorShell.DeleteElement(TableCaptionElement);
-        TableCaptionElement = null;
-      } 
-      else if( align != newAlign)
-      {
-        if (align == "top") // This is default, so don't explicitly set it
-          editorShell.RemoveAttribute(TableCaptionElement, "align");
-        else
-          editorShell.SetAttribute(TableCaptionElement, "align", newAlign);
-      }
-    } 
-    else if (newAlign != "")
-    {
-      // Create and insert a caption:
-      TableCaptionElement = editorShell.CreateElementWithDefaults("caption");
-      if (TableCaptionElement)
-      {
-        if (newAlign != "top")
-          TableCaptionElement.setAttribute("align", newAlign);
-        
+      if (newAlign != "top")
+        TableCaptionElement.setAttribute("align", newAlign);
+      
 dump("Insert a table caption...\n");
-        // Insert it into the table - caption is always inserted as first child
-        //  but check if we are inserting inside a <tbody>
-        var parent;
-        if (TableElement.firstChild.nodeName.toLowerCase == "tbody")
-          parent = TableElement.firstChild;
-        else
-           parent = TableElement;
+      // Insert it into the table - caption is always inserted as first child
+      //  but check if we are inserting inside a <tbody>
+      var parent;
+      if (TableElement.firstChild.nodeName.toLowerCase == "tbody")
+        parent = TableElement.firstChild;
+      else
+         parent = TableElement;
 
-        editorShell.InsertElement(TableCaptionElement, parent, 0);
+      editorShell.InsertElement(TableCaptionElement, parent, 0);
 
-        // Put selecton back where it was
-        ChangeSelection(RESET_SELECTION);
-      }
+      // Put selecton back where it was
+      ChangeSelection(RESET_SELECTION);
     }
   }
 
@@ -998,14 +985,14 @@ dump("Insert a table caption...\n");
   // If user is deleting any cells and get confirmation
   // (This is a global to the dialog and we ask only once per dialog session)
   if ( !canDelete &&
-       (dialog.RowsCheckbox.checked && newRowCount < rowCount ||
-        dialog.ColumnsCheckbox.checked && newColCount < colCount) &&
+       (newRowCount < rowCount ||
+        newColCount < colCount) &&
        ConfirmDeleteCells() )
   {
     canDelete = true;
   }
 
-  if (dialog.RowsCheckbox.checked && newRowCount != rowCount)
+  if (newRowCount != rowCount)
   {
     countDelta = newRowCount - rowCount;
     if (newRowCount > rowCount)
@@ -1072,7 +1059,7 @@ dump("Insert a table caption...\n");
     }
   }
 
-  if (dialog.ColumnsCheckbox.checked && newColCount != colCount)
+  if (newColCount != colCount)
   {
     countDelta = newColCount - colCount;
 
@@ -1136,26 +1123,13 @@ dump("Insert a table caption...\n");
     }
   }
 
-  if (dialog.TableHeightCheckbox.checked)
-    CloneAttribute(TableElement, globalTableElement, "height");
-
-  if (dialog.TableWidthCheckbox.checked)
-    CloneAttribute(TableElement, globalTableElement, "width");
-
-  if (dialog.TableBorderCheckbox.checked)
-    CloneAttribute(TableElement, globalTableElement, "border");
-
-  if (dialog.CellSpacingCheckbox.checked)
-    CloneAttribute(TableElement, globalTableElement, "cellspacing");
-
-  if (dialog.CellPaddingCheckbox.checked)
-    CloneAttribute(TableElement, globalTableElement, "cellpadding");
-
-  if (dialog.TableHAlignCheckbox.checked)
-    CloneAttribute(TableElement, globalTableElement, "align");
-
-  if (dialog.TableColorCheckbox.checked)
-    CloneAttribute(TableElement, globalTableElement, "bgcolor");
+  CloneAttribute(TableElement, globalTableElement, "height");
+  CloneAttribute(TableElement, globalTableElement, "width");
+  CloneAttribute(TableElement, globalTableElement, "border");
+  CloneAttribute(TableElement, globalTableElement, "cellspacing");
+  CloneAttribute(TableElement, globalTableElement, "cellpadding");
+  CloneAttribute(TableElement, globalTableElement, "align");
+  CloneAttribute(TableElement, globalTableElement, "bgcolor");
 }
 
 function ApplyCellAttributes()
@@ -1196,8 +1170,7 @@ function ApplyAttributesToOneCell(destElement)
   if (dialog.TextWrapCheckbox.checked)
     CloneAttribute(destElement, globalCellElement, "nowrap");
 
-  if (dialog.CellColorCheckbox.checked)
-    CloneAttribute(destElement, globalCellElement, "bgcolor");
+  CloneAttribute(destElement, globalCellElement, "bgcolor");
 
   if (dialog.CellStyleCheckbox.checked)
   {
diff --git a/mozilla/editor/ui/dialogs/content/EdTableProps.xul b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
index 932ece391c5..bdfa7fb6b26 100644
--- a/mozilla/editor/ui/dialogs/content/EdTableProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
@@ -150,9 +150,9 @@
             </box>
     	      <menupopup>
               <colorpicker id="tableBackgroundCP" palettename="standard" 
-                onclick="GetColorAndUpdate('tableBackgroundCP','tableBackgroundCW','TableColorCheckbox', this.parentNode);"/>
+                onclick="GetColorAndUpdate('tableBackgroundCP','tableBackgroundCW',null, this.parentNode);"/>
               <button class="dialog" value="&defaultColor.label;" 
-                oncommand="GetColorAndUpdate('tableBackgroundCP','tableBackgroundCW','TableColorCheckbox', this.parentNode)"/>
+                oncommand="GetColorAndUpdate('tableBackgroundCP','tableBackgroundCW',null, this.parentNode)"/>
     	      </menupopup>
           </menu>
           <spring class="spacer"/>
@@ -211,17 +211,15 @@
           </grid>
           <spring class="bigspacer"/>
           <grid>
-            <columns><column/><column/><column/></columns>
+            <columns><column/><column/></columns>
             <rows>
               <row valign="middle" autostretch="never">
-                <checkbox id="RowSpanCheckbox" value="&cellSpan.label;"/>
+                <checkbox id="RowSpanCheckbox" value="&cellRowSpan.label;"/>
                 <textfield class="narrow" id="RowSpanInput" onkeyup="ChangeIntTextfield(this.id,'RowSpanCheckbox');"/>
-                <text align="left" value="&cellSpanRows.label;"/>
               </row>
               <row valign="middle" autostretch="never">
-                <checkbox id="ColSpanCheckbox" value="&cellSpan.label;"/>
+                <checkbox id="ColSpanCheckbox" value="&cellColSpan.label;"/>
                 <textfield class="narrow" id="ColSpanInput" onkeyup="ChangeIntTextfield(this.id,'ColSpanCheckbox');"/>
-                <text align="left" value="&cellSpanCols.label;"/>
               </row>
             </rows>
           </grid>
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EdNamedAnchorProperties.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EdNamedAnchorProperties.dtd
index cce16c2597b..aab9b750fa6 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/EdNamedAnchorProperties.dtd
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EdNamedAnchorProperties.dtd
@@ -22,7 +22,6 @@
 
 <!ENTITY windowTitle.label "Named Anchor Properties">
 <!ENTITY anchorNameEditField.label "Anchor Name:">
-<!ENTITY noSpacesMsg.label "(Spaces are not allowed.)">
 <!ENTITY nameInput.tooltip "Enter a unique name for this named anchor (target)">
 
 
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorColorProperties.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EditorColorProperties.dtd
index 652f01272bb..d5bbf3bc395 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/EditorColorProperties.dtd
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EditorColorProperties.dtd
@@ -34,4 +34,4 @@
 <!ENTITY background.label "Background:">
 <!ENTITY colon.character ":">
 <!ENTITY backgroundImage.label "Background Image:">
-<!ENTITY backgroundImage.tooltip "Use an image file as the background for your document">
+<!ENTITY backgroundImage.tooltip "Use an image file as the background for your page">
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorLinkProperties.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EditorLinkProperties.dtd
index 0bdc1fa5d6d..8aa5c33e6b1 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/EditorLinkProperties.dtd
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EditorLinkProperties.dtd
@@ -27,5 +27,4 @@
 <!ENTITY NamedAnchorMsg.label "or select a Named Anchor:">
 <!ENTITY HeadingMsg.label "or select a Heading:">
 <!ENTITY HeadingMsg2.label "(A named anchor will be created automatically)">
-
-
+<!ENTITY RemoveLinkMsg.label "(Clear text to remove existing link from page.)">
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorPageProperties.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EditorPageProperties.dtd
index 271c9526a69..8432a657d3d 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/EditorPageProperties.dtd
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EditorPageProperties.dtd
@@ -28,4 +28,4 @@
 <!ENTITY authorInput.label "Author:">
 <!ENTITY descriptionInput.label "Description:">
 <!ENTITY locationNewPage.label "[New page, not saved yet]">
-<!ENTITY EditHEADSource.label "Advanced users:<html:br/>To edit contents of the &lt;head&gt; region, use &quot;HTML Source&quot; in the View Menu or Edit Toolbar.">
+<!ENTITY EditHEADSource.label "Advanced users:<html:br/>To edit contents of the &lt;head&gt; region, use &quot;HTML Source&quot; in the View Menu or Edit Mode Toolbar.">
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorSaveAsCharset.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EditorSaveAsCharset.dtd
index 7f8c60c188f..ba41092188e 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/EditorSaveAsCharset.dtd
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EditorSaveAsCharset.dtd
@@ -27,7 +27,7 @@
 <!-- These strings are for use specifically in the editor's link dialog. -->
 <!ENTITY windowTitle.label "Save As Charset">
 <!ENTITY documentTitleTitle.label "Page Title">
-<!ENTITY documentCharsetTitle.label "Document Charset">
+<!ENTITY documentCharsetTitle.label "Character Set">
 <!ENTITY documentCharsetDesc.label "Select the charset you want to save as:">
 
 
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorTableProperties.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EditorTableProperties.dtd
index 812de4d0929..9b0d3e4baac 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/EditorTableProperties.dtd
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EditorTableProperties.dtd
@@ -53,7 +53,8 @@
 <!ENTITY cellChangeSelectionMsg.label     "When moving the selection:">
 <!ENTITY cellApplyBeforeMove.label        "Apply changes before moving">
 <!ENTITY cellKeepCurrentData.label        "Keep current settings">
-<!ENTITY cellSpan.label                   "Span:">
+<!ENTITY cellRowSpan.label                "Row Span:">
+<!ENTITY cellColSpan.label                "Column Span:">
 <!ENTITY cellContentAlignment.label       "Content Alignment">
 <!ENTITY cellHorizontal.label             "Horizontal:">
 <!ENTITY cellVertical.label               "Vertical:">
@@ -68,8 +69,6 @@
 <!ENTITY cellAlignBottom.label            "Bottom">
 <!ENTITY cellAlignJustify.label           "Justify">
 <!ENTITY cellAlignAtChar.label            "At Character:">
-<!ENTITY cellSpanRows.label               "rows">
-<!ENTITY cellSpanCols.label               "columns">
 <!ENTITY cellInheritColor.label           "(Let table color show through)">
 <!-- Don't translate <html:br/> -->
 <!ENTITY cellUseCheckboxHelp.label        "Use checkboxes to determine which properties<html:br/>are applied to all selected cells">