From b954f4ef27fba38f1e2a02a921ec2ec1ea03b92c Mon Sep 17 00:00:00 2001
From: "cmanske%netscape.com" <cmanske%netscape.com>
Date: Fri, 24 Sep 1999 00:25:01 +0000
Subject: [PATCH] Fixed M11 bugs 14720 and 10666 (a=chofmann), bug 11097
 (a=leaf). All approved by buster (Steve Clark)

---
 editor/ui/composer/content/EditorContent.css      |  8 +++++++-
 editor/ui/composer/locale/en-US/editor.properties |  6 ++++--
 editor/ui/dialogs/content/EdDialogOverlay.xul     |  4 ++--
 editor/ui/dialogs/content/EdDialogTemplate.xul    |  2 +-
 editor/ui/dialogs/content/EdHLineProps.xul        |  6 +++---
 editor/ui/dialogs/content/EdImageProps.js         | 13 ++++++-------
 editor/ui/dialogs/content/EdImageProps.xul        |  2 +-
 editor/ui/dialogs/content/EdInsertTable.xul       | 10 +++++-----
 editor/ui/dialogs/content/EdLinkProps.js          |  4 ++--
 editor/ui/dialogs/content/EdLinkProps.xul         |  2 +-
 editor/ui/dialogs/content/EdListProps.xul         |  2 +-
 editor/ui/dialogs/content/EdNamedAnchorProps.xul  |  2 +-
 editor/ui/dialogs/content/EdTableProps.xul        |  2 +-
 13 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/editor/ui/composer/content/EditorContent.css b/editor/ui/composer/content/EditorContent.css
index bd436cb8596..9abf8201128 100644
--- a/editor/ui/composer/content/EditorContent.css
+++ b/editor/ui/composer/content/EditorContent.css
@@ -33,7 +33,7 @@ a:out-of-date img, img[usemap], object[usemap] {
 }
 
 
-/* new feature, not implemented yet */
+/* new feature, not implemented yet
 
 a[name] {
   display: inline-block;
@@ -44,6 +44,12 @@ a[name] {
   border: 1px solid blue;
   cursor: default;
 }
+*/
+
+a[name] {
+  padding-left: 10px; 
+  background: url(chrome://editor/skin/images/ED_Left.gif) 5px 50% no-repeat; 
+}
 
 table {
   empty-cells: show;
diff --git a/editor/ui/composer/locale/en-US/editor.properties b/editor/ui/composer/locale/en-US/editor.properties
index 343992c8ea7..851ab2069f1 100644
--- a/editor/ui/composer/locale/en-US/editor.properties
+++ b/editor/ui/composer/locale/en-US/editor.properties
@@ -30,6 +30,8 @@ NeedDocTitle=Document does not have a title.
 AttributesFor=Current attributes for: 
 MissingImageError=Please enter or choose an image<br>of type gif, jpg or png.
 EmptyHREFError=You must enter or choose<br>a location (URL) to create a new link.
+LinkText=Link text:
+EnterLinkText=Enter text to display for the link:
 EmptyLinkTextError=You must enter some text for this link.
 ValidateNumber1=The number you entered (
 ValidateNumber2=) is outside of allowed range.<br>Please enter a number between
@@ -47,6 +49,6 @@ Style_I=I,II,III...
 Style_i=i,ii,iii...
 Style_A=A,B,C...
 Style_a=a,b,c...
-
-
+PercentOfCell=% of cell
+PercentOfWindow=% of window
 
diff --git a/editor/ui/dialogs/content/EdDialogOverlay.xul b/editor/ui/dialogs/content/EdDialogOverlay.xul
index 8fcf5bc490b..2c9e312c7c6 100644
--- a/editor/ui/dialogs/content/EdDialogOverlay.xul
+++ b/editor/ui/dialogs/content/EdDialogOverlay.xul
@@ -28,8 +28,8 @@
 		 xmlns:html="http://www.w3.org/TR/REC-html40"
 		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<box id="advancedEditButton" align="vertical">
-  <box align="horizontal" id="advancedEditButtonNoHR" style="margin-top: 0.2em">
+<box id="AdvancedEditButton" align="vertical">
+  <box align="horizontal" id="AdvancedEditButtonNoHR" style="margin-top: 0.2em">
     <titledbutton class="hspaced" id="AdvancedEdit" onclick="onAdvancedEdit()" value="&AdvancedEditButton.label;"/>
   </box>
   <html:div><html:hr width="100%"/></html:div>
diff --git a/editor/ui/dialogs/content/EdDialogTemplate.xul b/editor/ui/dialogs/content/EdDialogTemplate.xul
index 09992cc0d9f..2dda6e88284 100644
--- a/editor/ui/dialogs/content/EdDialogTemplate.xul
+++ b/editor/ui/dialogs/content/EdDialogTemplate.xul
@@ -48,7 +48,7 @@
   <xul:keyset id="keyset"/>
 
   <!-- from EdDialogOverlay -->
-  <xul:box id="advancedEditButton"/>
+  <xul:box id="AdvancedEditButton"/>
   <!-- from global dialogOverlay -->
 	<xul:box id="okCancelButtons"/> 
 </xul:window>
diff --git a/editor/ui/dialogs/content/EdHLineProps.xul b/editor/ui/dialogs/content/EdHLineProps.xul
index 21212cd78a0..79f4112c900 100644
--- a/editor/ui/dialogs/content/EdHLineProps.xul
+++ b/editor/ui/dialogs/content/EdHLineProps.xul
@@ -57,7 +57,7 @@
               </td>
               <td colspan="2">
                 <input type="text" id="height" size="4" maxlength="4"
-                    onkeypress="forceInteger('height')" />
+                    onkeyup="forceInteger('height')" />
                 <label> &pixelsPopup.value; </label>
               </td>
             </tr>
@@ -67,7 +67,7 @@
               </td>
               <td>
                 <input type="text" id="width" size="4" maxlength="4"
-                    onkeypress="forceInteger('width')" />
+                    onkeyup="forceInteger('width')" />
               </td>
               <td>
                 <xul:menu>
@@ -102,7 +102,7 @@
     </tr>
   </table>
   <!-- from EdDialogOverlay -->
-  <xul:box id="advancedEditButton"/>
+  <xul:box id="AdvancedEditButton"/>
   <!-- from global dialogOverlay -->
 	<xul:box id="okCancelButtons"/> 
 </xul:window>
diff --git a/editor/ui/dialogs/content/EdImageProps.js b/editor/ui/dialogs/content/EdImageProps.js
index f6c3a92d869..742a763f3b5 100644
--- a/editor/ui/dialogs/content/EdImageProps.js
+++ b/editor/ui/dialogs/content/EdImageProps.js
@@ -532,7 +532,7 @@ function setDimensions()
   var htype                             = dialog.imageheightSelect.getAttribute("value");
 
     // width
-    // NO! this is not the way to do it! Depends on english strings
+    // TODO: NO! this is not the way to do it! Depends on english strings
     //  Instead, store which index is selected when popup "pixel" or "percent of..." is used
     if (wtype.substr(0,4) == "% of")
     {
@@ -564,18 +564,17 @@ function setPopup(dim)
     if (select.nodeName == "TD")
     { 
       if (dim == "w")
-        dialog.imagewidthSelect.setAttribute("value", "% of cell");
+        dialog.imagewidthSelect.setAttribute("value",GetString("PercentOfCell"));
       else
-        dialog.imageheightSelect.setAttribute("value", "% of cell");
-    }
+        dialog.imageheightSelect.setAttribute("value",GetString("PercentOfCell"));
+    
     else
     {
       if (dim == "w")
-        dialog.imagewidthSelect.setAttribute("value", "% of window");
+        dialog.imagewidthSelect.setAttribute("value",GetString("PercentOfWindow"));
       else
-        dialog.imageheightSelect.setAttribute("value", "% of window");
+        dialog.imageheightSelect.setAttribute("value",GetString("PercentOfWindow"));
     }
-
 }
 
 // This function moves the selected item into view
diff --git a/editor/ui/dialogs/content/EdImageProps.xul b/editor/ui/dialogs/content/EdImageProps.xul
index 705f46d92c3..58503f92de5 100644
--- a/editor/ui/dialogs/content/EdImageProps.xul
+++ b/editor/ui/dialogs/content/EdImageProps.xul
@@ -480,7 +480,7 @@
     </tr>
 </table>
 <!-- from EdDialogOverlay -->
-<xul:box id="advancedEditButtonNoHR"/>
+<xul:box id="AdvancedEditButtonNoHR"/>
 
 </div> <!-- END of "MoreRow" block that is hidden by More/Fewer button -->
 
diff --git a/editor/ui/dialogs/content/EdInsertTable.xul b/editor/ui/dialogs/content/EdInsertTable.xul
index 499949fcd77..4f9348634b4 100644
--- a/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/editor/ui/dialogs/content/EdInsertTable.xul
@@ -53,7 +53,7 @@
       </td>
       <td cellspan="2">
         <input type="text" id="rows" maxlength="4" size="4"
-            onkeypress="forceInteger('rows')" />
+            onkeyup="forceInteger('rows')" />
       </td>
     </tr>
     <tr class="vcenter">
@@ -62,7 +62,7 @@
       </td>
       <td cellspan="2">
         <input type="text" id="columns" maxlength="4" size="4"
-            onkeypress="forceInteger('columns')" />
+            onkeyup="forceInteger('columns')" />
       </td>
     </tr>
     <tr class="vcenter">
@@ -71,7 +71,7 @@
       </td>
       <td>
         <input type="text" id="width" size="4" maxlength="4"
-            onkeypress="forceInteger('width')" />
+            onkeyup="forceInteger('width')" />
        </td>
        <td>
         <xul:titledbutton class="popup" id="pixelOrPercentButton" 
@@ -85,7 +85,7 @@
       <td>
         <!-- THIS IS DUMB Can't figure out how to put "pixels" after the 
              input box and make them center vertically. Used another TD instead -->
-        <input type="text" id="border" size="4" onkeypress="forceInteger('border')"/>
+        <input type="text" id="border" size="4" onkeyup="forceInteger('border')"/>
       </td>
       <td>
         <label for="border"> &pixelsPopup.value; </label>
@@ -94,7 +94,7 @@
   </table>
   <xul:spring class="spacer"/>
   <!-- from EdDialogOverlay -->
-  <xul:box id="advancedEditButton"/>
+  <xul:box id="AdvancedEditButton"/>
   <!-- from global dialogOverlay -->
 	<xul:box id="okCancelButtons"/> 
 
diff --git a/editor/ui/dialogs/content/EdLinkProps.js b/editor/ui/dialogs/content/EdLinkProps.js
index 6f9e186a6ea..7c590b05828 100644
--- a/editor/ui/dialogs/content/EdLinkProps.js
+++ b/editor/ui/dialogs/content/EdLinkProps.js
@@ -106,7 +106,7 @@ function Startup()
       //   or an image, then shouldn't we clear the selection and insert new text?
       insertNew = selection.isCollapsed;
       dump("insertNew is " + insertNew + "\n");
-      linkCaption.data = "Enter text for the link:"
+      linkCaption.data = GetString("EnterLinkText");
       linkMessage.data = "";
     }
   }
@@ -126,7 +126,7 @@ function Startup()
     }
     linkMessage.data = selectedText;
     // The label above the selected text:
-    linkCaption.data = "Link text:"
+    linkCaption.data = GetString("LinkText");
   }
 
   if (!selection.isCollapsed)
diff --git a/editor/ui/dialogs/content/EdLinkProps.xul b/editor/ui/dialogs/content/EdLinkProps.xul
index ddff569e44c..a3e753bdbad 100644
--- a/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/editor/ui/dialogs/content/EdLinkProps.xul
@@ -69,7 +69,7 @@
     </fieldset>
   </xul:box>
   <!-- from EdDialogOverlay -->
-  <xul:box id="advancedEditButton"/>
+  <xul:box id="AdvancedEditButton"/>
   <!-- from global dialogOverlay -->
 	<xul:box id="okCancelButtons"/> 
 </xul:window>
diff --git a/editor/ui/dialogs/content/EdListProps.xul b/editor/ui/dialogs/content/EdListProps.xul
index 2283e812203..92d1fb6898a 100644
--- a/editor/ui/dialogs/content/EdListProps.xul
+++ b/editor/ui/dialogs/content/EdListProps.xul
@@ -65,7 +65,7 @@
   </xul:box>
   <xul:broadcaster id="args" value=""/>
   <!-- from EdDialogOverlay -->
-  <xul:box id="advancedEditButton"/>
+  <xul:box id="AdvancedEditButton"/>
   <!-- from global dialogOverlay -->
 	<xul:box id="okCancelButtons"/> 
 
diff --git a/editor/ui/dialogs/content/EdNamedAnchorProps.xul b/editor/ui/dialogs/content/EdNamedAnchorProps.xul
index da2ed245354..77bb213af50 100644
--- a/editor/ui/dialogs/content/EdNamedAnchorProps.xul
+++ b/editor/ui/dialogs/content/EdNamedAnchorProps.xul
@@ -48,7 +48,7 @@
   <label class="spacedtext" for="nameInput"> &anchorNameEditField.label; </label>
   <input type="text" id="nameInput" size="30" maxlength="255" />
   <!-- from EdDialogOverlay -->
-  <xul:box id="advancedEditButton"/>
+  <xul:box id="AdvancedEditButton"/>
   <!-- from global dialogOverlay -->
   <xul:box id="okCancelButtons"/> 
 
diff --git a/editor/ui/dialogs/content/EdTableProps.xul b/editor/ui/dialogs/content/EdTableProps.xul
index 6830f665d8e..bb0237337fd 100644
--- a/editor/ui/dialogs/content/EdTableProps.xul
+++ b/editor/ui/dialogs/content/EdTableProps.xul
@@ -382,7 +382,7 @@
       </tabcontrol>
       <box align="horizontal">
         <!-- from EdDialogOverlay -->
-        <box id="advancedEditButton"/>
+        <box id="AdvancedEditButton"/>
         <spring flex="100%"/>
 	      <box id="okCancelButtons"/> 
       </box>