#280 Bad UI layout and label in Calendar clone window

common/content/exchangeCloneSettings.js

@@ -40,7 +40,7 @@ exchExchangeCloneSettings.prototype = {
         if (vbox) {
             let eList = vbox.getElementsByAttribute('required', 'true');
             for (let i = 0; i < eList.length && canAdvance; ++i) {
-                canAdvance = (eList[i].value != "");
+                canAdvance = (eList[i].value !== "");
             }
 
             if (canAdvance) {
@@ -60,16 +60,16 @@ exchExchangeCloneSettings.prototype = {
     },
 
     onSave: function _onSave() {
-        var oldCalId = this._window.arguments[0].calendar.id;
+        let oldCalId = this._window.arguments[0].calendar.id;
 
         // Clone the Calendar settings to a new cal id.
-        var newCalId = this.globalFunctions.copyCalendarSettings(oldCalId);
+        let newCalId = this.globalFunctions.copyCalendarSettings(oldCalId);
 
         // Save settings in dialog to new cal id.
         tmpSettingsOverlay.exchWebServicesSaveExchangeSettingsByCalId(newCalId);
 
         // Save the description/name for the calendar and create a new unique uri.
-        var toCalPrefs = Cc["@mozilla.org/preferences-service;1"]
+        let toCalPrefs = Cc["@mozilla.org/preferences-service;1"]
             .getService(Ci.nsIPrefService)
             .getBranch("calendar.registry." + newCalId + ".");
 
@@ -85,7 +85,6 @@ exchExchangeCloneSettings.prototype = {
             .getService(Ci.nsIPrefService).savePrefFile(null);
         return true;
     },
-
-}
+};
 
 var tmpExchangeCloneSettings = new exchExchangeCloneSettings(document, window);

common/content/exchangeCloneSettings.xul

@@ -39,10 +39,20 @@
         onload="tmpExchangeCloneSettings.onLoad();">
     <script type="application/javascript"
             src="chrome://exchangecommon/content/exchangeCloneSettings.js" />
-    <hbox>
-        <label value="&label.ecExchangeSettings.title;" />
-        <textbox id="exchWebService_clone_description" />
-    </hbox>
+    <grid flex="1">
+        <columns>
+            <column />
+            <column flex="1" />
+        </columns>
+        <rows>
+            <row align="center">
+                <label value="&label.ecExchangeSettings.title;" />
+                <vbox>
+                    <textbox id="exchWebService_clone_description" />
+                </vbox>
+            </row>
+        </rows>
+    </grid>
     <vbox id="exchWebService-exchange-settings"
           flex="1"></vbox>
 </dialog>

common/locale/cs_CZ/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Uložit">
 <!ENTITY label.cancelbutton "Storno">
 
-<!ENTITY label.ecExchangeSettings.title "Nový popis:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Název kalendáře:">

common/locale/de/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Speichern">
 <!ENTITY label.cancelbutton "Abbrechen">
 
-<!ENTITY label.ecExchangeSettings.title "Neue Beschreibung:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Kalendername:">

common/locale/en/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Save">
 <!ENTITY label.cancelbutton "Cancel">
 
-<!ENTITY label.ecExchangeSettings.title "New description:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">

common/locale/en_US/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Save">
 <!ENTITY label.cancelbutton "Cancel">
 
-<!ENTITY label.ecExchangeSettings.title "New description:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">

common/locale/es_ES/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Guardar">
 <!ENTITY label.cancelbutton "Cancelar">
 
-<!ENTITY label.ecExchangeSettings.title "Nueva descripción:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Nombre del calendario:">

common/locale/fr_FR/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Sauvegarder">
 <!ENTITY label.cancelbutton "Annuler">
 
-<!ENTITY label.ecExchangeSettings.title "Nouvelle description :">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">

common/locale/gl/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Gardar">
 <!ENTITY label.cancelbutton "Cancelar">
 
-<!ENTITY label.ecExchangeSettings.title "Nova descrición:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Nome do calendario:">

common/locale/hu/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Mentés">
 <!ENTITY label.cancelbutton "Mégse">
 
-<!ENTITY label.ecExchangeSettings.title "Új leírás:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Naptár neve:">

common/locale/it_IT/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Salva">
 <!ENTITY label.cancelbutton "Annulla">
 
-<!ENTITY label.ecExchangeSettings.title "Nuova descrizione:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">

common/locale/ja_JP/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Save">
 <!ENTITY label.cancelbutton "Cancel">
 
-<!ENTITY label.ecExchangeSettings.title "New description:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">

common/locale/nl/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Opslaan">
 <!ENTITY label.cancelbutton "Annuleren">
 
-<!ENTITY label.ecExchangeSettings.title "Nieuwe omschrijving:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">

common/locale/pl/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Save">
 <!ENTITY label.cancelbutton "Cancel">
 
-<!ENTITY label.ecExchangeSettings.title "New description:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">

common/locale/pt_BR/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Save">
 <!ENTITY label.cancelbutton "Cancel">
 
-<!ENTITY label.ecExchangeSettings.title "New description:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">

common/locale/ro/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Save">
 <!ENTITY label.cancelbutton "Cancel">
 
-<!ENTITY label.ecExchangeSettings.title "New description:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">

common/locale/ru/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Сохранить">
 <!ENTITY label.cancelbutton "Отмена">
 
-<!ENTITY label.ecExchangeSettings.title "Новое описание:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">

common/locale/sk/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Uložiť">
 <!ENTITY label.cancelbutton "Zrušiť">
 
-<!ENTITY label.ecExchangeSettings.title "Nový popis:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">

common/locale/sv/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Spara">
 <!ENTITY label.cancelbutton "Avbryt">
 
-<!ENTITY label.ecExchangeSettings.title "Ny beskrivning:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">

common/locale/tr/exchangeCloneSettings.dtd

@@ -1,6 +1,4 @@
 <!ENTITY label.acceptbutton "Kaydet">
 <!ENTITY label.cancelbutton "İptal Et">
 
-<!ENTITY label.ecExchangeSettings.title "Yeni tarif:">
-
-
+<!ENTITY label.ecExchangeSettings.title "Calendar name:">