Skip to content
This repository has been archived by the owner on Jul 2, 2024. It is now read-only.

Commit

Permalink
#280 Bad UI layout and label in Calendar clone window
Browse files Browse the repository at this point in the history
* Fix label alignment.
* Improve calendar name label text.
* Improve variable declarations.
* Fix missing semicolon.
* Improve comparison operator.
  • Loading branch information
advancingu committed May 27, 2019
1 parent b2457a7 commit 75552b7
Show file tree
Hide file tree
Showing 20 changed files with 37 additions and 64 deletions.
11 changes: 5 additions & 6 deletions common/content/exchangeCloneSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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 + ".");

Expand All @@ -85,7 +85,6 @@ exchExchangeCloneSettings.prototype = {
.getService(Ci.nsIPrefService).savePrefFile(null);
return true;
},

}
};

var tmpExchangeCloneSettings = new exchExchangeCloneSettings(document, window);
18 changes: 14 additions & 4 deletions common/content/exchangeCloneSettings.xul
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 1 addition & 3 deletions common/locale/cs_CZ/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Uložit">
<!ENTITY label.cancelbutton "Storno">

<!ENTITY label.ecExchangeSettings.title "Nový popis:">


<!ENTITY label.ecExchangeSettings.title "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/de/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Speichern">
<!ENTITY label.cancelbutton "Abbrechen">

<!ENTITY label.ecExchangeSettings.title "Neue Beschreibung:">


<!ENTITY label.ecExchangeSettings.title "Kalendername:">
4 changes: 1 addition & 3 deletions common/locale/en/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Save">
<!ENTITY label.cancelbutton "Cancel">

<!ENTITY label.ecExchangeSettings.title "New description:">


<!ENTITY label.ecExchangeSettings.title "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/en_US/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Save">
<!ENTITY label.cancelbutton "Cancel">

<!ENTITY label.ecExchangeSettings.title "New description:">


<!ENTITY label.ecExchangeSettings.title "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/es_ES/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Guardar">
<!ENTITY label.cancelbutton "Cancelar">

<!ENTITY label.ecExchangeSettings.title "Nueva descripción:">


<!ENTITY label.ecExchangeSettings.title "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/fr_FR/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Sauvegarder">
<!ENTITY label.cancelbutton "Annuler">

<!ENTITY label.ecExchangeSettings.title "Nouvelle description :">


<!ENTITY label.ecExchangeSettings.title "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/gl/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Gardar">
<!ENTITY label.cancelbutton "Cancelar">

<!ENTITY label.ecExchangeSettings.title "Nova descrición:">


<!ENTITY label.ecExchangeSettings.title "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/hu/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -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 "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/it_IT/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Salva">
<!ENTITY label.cancelbutton "Annulla">

<!ENTITY label.ecExchangeSettings.title "Nuova descrizione:">


<!ENTITY label.ecExchangeSettings.title "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/ja_JP/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Save">
<!ENTITY label.cancelbutton "Cancel">

<!ENTITY label.ecExchangeSettings.title "New description:">


<!ENTITY label.ecExchangeSettings.title "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/nl/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Opslaan">
<!ENTITY label.cancelbutton "Annuleren">

<!ENTITY label.ecExchangeSettings.title "Nieuwe omschrijving:">


<!ENTITY label.ecExchangeSettings.title "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/pl/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Save">
<!ENTITY label.cancelbutton "Cancel">

<!ENTITY label.ecExchangeSettings.title "New description:">


<!ENTITY label.ecExchangeSettings.title "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/pt_BR/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Save">
<!ENTITY label.cancelbutton "Cancel">

<!ENTITY label.ecExchangeSettings.title "New description:">


<!ENTITY label.ecExchangeSettings.title "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/ro/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Save">
<!ENTITY label.cancelbutton "Cancel">

<!ENTITY label.ecExchangeSettings.title "New description:">


<!ENTITY label.ecExchangeSettings.title "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/ru/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Сохранить">
<!ENTITY label.cancelbutton "Отмена">

<!ENTITY label.ecExchangeSettings.title "Новое описание:">


<!ENTITY label.ecExchangeSettings.title "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/sk/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -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:">
4 changes: 1 addition & 3 deletions common/locale/sv/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<!ENTITY label.acceptbutton "Spara">
<!ENTITY label.cancelbutton "Avbryt">

<!ENTITY label.ecExchangeSettings.title "Ny beskrivning:">


<!ENTITY label.ecExchangeSettings.title "Calendar name:">
4 changes: 1 addition & 3 deletions common/locale/tr/exchangeCloneSettings.dtd
Original file line number Diff line number Diff line change
@@ -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:">

0 comments on commit 75552b7

Please sign in to comment.