#241 Input window usability can be improved

* Add window elements to grid for vertical centering. * Fix incorrect use of sentence dot in UI elements. * Simplify wording. * Make email address field scale with window. * Remove dead code. * Improve code formatting.
ExchangeCalendar · Feb 26, 2019 · c169a8c · c169a8c
1 parent 8858002
commit c169a8c
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 39 deletions.
diff --git a/addressbook/content/exchangeContactSettings.xul b/addressbook/content/exchangeContactSettings.xul
@@ -38,20 +38,30 @@
         ondialogaccept="return tmpExchangeContactSettings.onSave();"
         onload="tmpExchangeContactSettings.onLoad();">
     <script type="application/javascript"
-            src="chrome://exchangecontacts/content/exchangeContactSettings.js" />
-    <hbox>
-        <label value="&label.ecExchangeSettings.title;" />
-        <textbox id="exchWebService_contact_description" />
-    </hbox>
-    <hbox>
-        <label value="&exchangeWebService.preference.contacts.pollinterval;" />
-        <textbox id="exchangeWebService_preference_contacts_pollinterval"
-                 preference="extensions.1st-setup.core.debuglevel"
-                 increment="1"
-                 min="1"
-                 type="number" />
-    </hbox>
+            src="chrome://exchangecontacts/content/exchangeContactSettings.js"/>
+
+    <grid flex="1">
+        <columns>
+            <column/>
+            <column flex="1"/>
+        </columns>
+        <rows>
+            <row align="center">
+                <label value="&label.ecExchangeSettings.title;"/>
+                <textbox id="exchWebService_contact_description"/>
+            </row>
+            <row align="center">
+                <label value="&exchangeWebService.preference.contacts.pollinterval;"/>
+                <textbox id="exchangeWebService_preference_contacts_pollinterval"
+                         preference="extensions.1st-setup.core.debuglevel"
+                         increment="1"
+                         min="1"
+                         type="number"/>
+            </row>
+        </rows>
+    </grid>
     <checkbox label="&exchWebService.add.globaladdresslist.label;"
-              id="exchWebService-add-globaladdresslist" />
+              id="exchWebService-add-globaladdresslist"/>
+
     <vbox id="exchWebService-exchange-settings"></vbox>
 </dialog>
diff --git a/addressbook/locale/en/exchangeContactSettings.dtd b/addressbook/locale/en/exchangeContactSettings.dtd
@@ -9,4 +9,4 @@
 <!ENTITY label.ecExchangeSettings.title "Name in list:">
 <!ENTITY exchangeWebService.preference.contacts.pollinterval "Refresh interval in seconds:">
 
-<!ENTITY exchWebService.add.globaladdresslist.label "Add global address list to search results.">
+<!ENTITY exchWebService.add.globaladdresslist.label "Add global address list to search results">
diff --git a/common/content/exchangeSettingsOverlay.js b/common/content/exchangeSettingsOverlay.js
@@ -674,10 +674,8 @@ exchSettingsOverlay.prototype = {
             }
             else {
                 // We only have one url. Use it.
-                //			selectedEWSUrl.value = ewsUrls.text();
                 selectedEWSUrl.value = ewsUrls[0].value;
             }
-
         }
 
         if (!userCancel) {

diff --git a/common/content/exchangeSettingsOverlay.xul b/common/content/exchangeSettingsOverlay.xul
@@ -88,10 +88,10 @@
                             <textbox id="exchWebService_mailbox"
                                      required="true"
                                      oninput="tmpSettingsOverlay.exchWebServicesDoMailboxChanged(this);"
-                                     placeholder="[email protected]" />
+                                     placeholder="[email protected]"
+                                     flex="1" />
                             <label id="exchWebService_displayname"
-                                   value=""
-                                   flex="1" />
+                                   value="" />
                         </hbox>
                     </row>
                     <row align="center">

diff --git a/common/content/oofSettings.js b/common/content/oofSettings.js
@@ -14,10 +14,10 @@
  * -- Exchange 2007/2010 Calendar and Tasks Provider.
  * -- For Thunderbird with the Lightning add-on.
  *
- * This work is a combination of the Storage calendar, part of the default Lightning add-on, and 
+ * This work is a combination of the Storage calendar, part of the default Lightning add-on, and
  * the "Exchange Data Provider for Lightning" add-on currently, october 2011, maintained by Simon Schubert.
- * Primarily made because the "Exchange Data Provider for Lightning" add-on is a continuation 
- * of old code and this one is build up from the ground. It still uses some parts from the 
+ * Primarily made because the "Exchange Data Provider for Lightning" add-on is a continuation
+ * of old code and this one is build up from the ground. It still uses some parts from the
  * "Exchange Data Provider for Lightning" project.
  *
  * Author: Michel Verbraak ([email protected])
@@ -37,21 +37,10 @@
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 
-
-
 ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
 ChromeUtils.import("resource://exchangecommon/erGetUserOofSettings.js");
 ChromeUtils.import("resource://exchangecommon/erSetUserOofSettings.js");
 
-//ChromeUtils.import("resource://exchangecommon/ecFunctions.js");
-
-//if (! exchWebService) var exchWebService = {};
-
-/*if (! this.cal) {
-	ChromeUtils.import("resource://calendar/modules/calUtils.jsm", exchWebService);
-}
-*/
-
 function exchOOFSettings(aDocument, aWindow) {
     this._document = aDocument;
     this._window = aWindow;
@@ -62,8 +51,6 @@ function exchOOFSettings(aDocument, aWindow) {
 
 exchOOFSettings.prototype = {
 
-    //exchWebService.oofSettings = {
-
     calPrefs: null,
     intOofSettings: {},
 
@@ -200,10 +187,8 @@ exchOOFSettings.prototype = {
         var externalReply = this.intOofSettings.externalReply;
 
         internalReply = "<html>" + this.internalEditorElement.content + "</html>";
-
         externalReply = "<html>" + this.externalEditorElement.content + "</html>";
 
-
         var self = this;
         var tmpObject = new erSetUserOofSettingsRequest({
                 user: this.globalFunctions.safeGetCharPref(this.calPrefs, "ecDomain", "null") + "\\" + this.globalFunctions.safeGetCharPref(this.calPrefs, "ecUser", "null"),

diff --git a/common/locale/en/exchangeSettingsOverlay.dtd b/common/locale/en/exchangeSettingsOverlay.dtd
@@ -1,4 +1,4 @@
-<!ENTITY ecautodiscover "Use Exchange's autodiscovery function.">
+<!ENTITY ecautodiscover "Use Exchange autodiscovery">
 <!ENTITY ecfolderbase.label "Folder base:">
 <!ENTITY ecfolderpath.label "Path below folder base:">
 <!ENTITY ecfolderidofshare.label "Share Folder ID:">