Fixed bug 11064 and other minor XUL changes

editor/ui/composer/content/EditorCommands.js

@@ -520,13 +520,14 @@ function EditorToggleDisplayStyle()
     EditorDisplayStyle = false;
     styleSheet = "resource:/res/ua.css";
     //TODO: Where do we store localizable JS strings?
-    buttonText = "Preview";
+    buttonText = "Edit Mode";
   }
   else {
     EditorDisplayStyle = true;
     styleSheet = "chrome://editor/content/EditorContent.css"
-    buttonText = "Edit Mode";
+    buttonText = "Preview";
   }
+  //TODO: THIS IS NOT THE RIGHT THING TO DO!
   EditorApplyStyleSheet(styleSheet);
   
   button = document.getElementById("DisplayStyleButton");

editor/ui/dialogs/content/EdLinkProps.xul

@@ -57,19 +57,18 @@
     <xul:spring class="bigspacer"/>
 
     <fieldset><legend align="left"> &LinkURLFieldset.label; </legend>
-      <!-- xul:box align="vertical" -->
-        <xul:box align="horizontal">
-  <!--  	    <label for="ChooseFile"> &LinkURLEditField.label; </label> -->
-          <div> &LinkURLEditField.label;</div>
-          <xul:spring flex="100%"/>
-	        <xul:titledbutton class="hspaced" id="RemoveLink" onclick="RemoveLink()" value="&RemoveLinkButton.label;"/>
-	      </xul:box>
-	      <xul:box align="horizontal">
-  	      <input type="text" size="25" length="25" id="hrefInput"></input>
-          <xul:spring flex="100%"/>
-	        <xul:titledbutton class="hspaced" id="ChooseFile" onclick="ChooseFile()" value="&LinkChooseFileButton.label;"/>
-        </xul:box>
-      <!-- /xul:box -->
+    <!-- xul:box align="vertical" -->
+      <xul:box align="horizontal">
+        <div> &LinkURLEditField.label;</div>
+        <xul:spring flex="100%"/>
+	      <xul:titledbutton class="hspaced" id="RemoveLink" onclick="RemoveLink()" value="&RemoveLinkButton.label;"/>
+	    </xul:box>
+	    <xul:box align="horizontal">
+  	    <input type="text" size="25" length="25" id="hrefInput"></input>
+        <xul:spring flex="100%"/>
+	      <xul:titledbutton class="hspaced" id="ChooseFile" onclick="ChooseFile()" value="&LinkChooseFileButton.label;"/>
+      </xul:box>
+    <!-- /xul:box -->
     </fieldset>
   </xul:box>
   <xul:spring class="bigspacer"/>