From 95d068149c2eec1cc1e58d5164318ca9f020e5bd Mon Sep 17 00:00:00 2001 From: Ankita Saxena Date: Thu, 14 Dec 2017 23:01:36 +0530 Subject: [PATCH] line edit --- aggregate-install.rst | 4 ++-- collect-connect-aggregate.rst | 10 +++++----- collect-connect-google.rst | 6 +++--- collect-connect.rst | 2 +- collect-filling-forms.rst | 2 +- collect-forms.rst | 2 +- form-widgets.rst | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/aggregate-install.rst b/aggregate-install.rst index a2c847332..adb522e8e 100644 --- a/aggregate-install.rst +++ b/aggregate-install.rst @@ -68,7 +68,7 @@ Installing on App Engine .. image:: /img/aggregate-install/notification.* :alt: Image showing blue notification icon. -- Click on the notification icon and select the first option from the dropdown menu then. The option is labelled as *Create Project:your project name*. +- Click on the notification icon and select the first option from the dropdown menu then. The option is labeled as *Create Project:your project name*. .. image:: /img/aggregate-install/go-to-project.* :alt: Image showing the option to create your project. @@ -116,7 +116,7 @@ Installing on App Engine - If you are running OSX, you must unzip the downloaded file before running the installer within it. - If you are on MacOSX Mountain Lion or onward, you will need to fiddle with `GateKeeper settings `_ in order to run the installer. - If you are on Windows 10, you will need to approve running an unsigned installer. - - If you are on Linux, you will need to change the downloaded file's permissions to enable running it as a program. Right click on the file and click on :guilabel:`Properties`. Click on :guilabel:`Permissions` tab. Now check the box labelled as :guilabel:`Allow executing file as program`. Now double click on the file to run it. + - If you are on Linux, you will need to change the downloaded file's permissions to enable running it as a program. Right click on the file and click on :guilabel:`Properties`. Click on :guilabel:`Permissions` tab. Now check the box labeled as :guilabel:`Allow executing file as program`. Now double click on the file to run it. - The installer will guide you through configuring ODK Aggregate for App Engine. Click on :guilabel:`Forward` button each time you complete a step to move ahead. diff --git a/collect-connect-aggregate.rst b/collect-connect-aggregate.rst index 3241d19b7..617edec3f 100644 --- a/collect-connect-aggregate.rst +++ b/collect-connect-aggregate.rst @@ -28,22 +28,22 @@ Connecting to your own ODK Aggregate Server 3. Select :guilabel:`Type`, and set it to :menuselection:`ODK Aggregate` .. image:: /img/collect-connect/server-settings-type-aggregate.* - :alt: The Server Settings screen in the Collect app. The first item in the menu is labelled *Type*, and this item is circled in red. + :alt: The Server Settings screen in the Collect app. The first item in the menu is labeled *Type*, and this item is circled in red. .. image:: /img/collect-connect/server-settings-type-modal.* - :alt: The Server Settings screen in the Collect App, as displayed in the previous image. There is now a modal menu labelled *Platform*, with single-select radio buttons for: *ODK Aggregate*, *Google Drive, Google Sheets*, and *Other*. *ODK Aggregate* is selected and circled in red. + :alt: The Server Settings screen in the Collect App, as displayed in the previous image. There is now a modal menu labeled *Platform*, with single-select radio buttons for: *ODK Aggregate*, *Google Drive, Google Sheets*, and *Other*. *ODK Aggregate* is selected and circled in red. 4. Edit :guilabel:`ODK Aggregate settings` .. image:: /img/collect-connect/server-settings-aggregate-settings.* - :alt: The Server Settings screen in the Collect app. Below the *Type* option is a section titled *ODK Aggregate Settings*, with the items labelled *URL*, *Username*, and *Password*. These three items are numbered in red. + :alt: The Server Settings screen in the Collect app. Below the *Type* option is a section titled *ODK Aggregate Settings*, with the items labeled *URL*, *Username*, and *Password*. These three items are numbered in red. .. image:: /img/collect-connect/server-settings-server-url.* - :alt: The Server Settings screen in the Collect app, with a modal overlay titled *Server URL*. There is a single text-entry field with a URL, and buttons labelled OK and CANCEL. + :alt: The Server Settings screen in the Collect app, with a modal overlay titled *Server URL*. There is a single text-entry field with a URL, and buttons labeled OK and CANCEL. .. image:: /img/collect-connect/server-settings-odk-username.* - :alt: The Server Settings screen in the Collect app, with a modal overlay titled *ODK Username.* There is a single text-entry field, and buttons labelled OK and CANCEL. + :alt: The Server Settings screen in the Collect app, with a modal overlay titled *ODK Username.* There is a single text-entry field, and buttons labeled OK and CANCEL. .. image:: /img/collect-connect/server-settings-odk-password.* :alt: The Server Settings screen in the Collect app, with a modal overlay titled *ODK Password*. There is a single obscured-text field, and buttons for OK and CANCEL. diff --git a/collect-connect-google.rst b/collect-connect-google.rst index e6f6a2c2e..4c8d855d9 100644 --- a/collect-connect-google.rst +++ b/collect-connect-google.rst @@ -22,10 +22,10 @@ Connecting to a Google Drive Account 3. Select :guilabel:`Type`, and set it to :menuselection:`Google Drive, Google Sheets` .. image:: /img/collect-connect/server-settings-type-google.* - :alt: The Server Settings screen in the Collect app. The first item in the menu is labelled *Type*, and this item is circled in red. + :alt: The Server Settings screen in the Collect app. The first item in the menu is labeled *Type*, and this item is circled in red. .. image:: /img/collect-connect/server-settings-type-model-google.* - :alt: The Server Settings screen in the Collect App, as displayed in the previous image. There is now a modal menu labelled *Platform*, with single-select radio buttons for: *ODK Aggregate*, *Google Drive, Google Sheets*, and *Other*. *Google Drive, Google Sheets* is selected and circled in red. + :alt: The Server Settings screen in the Collect App, as displayed in the previous image. There is now a modal menu labeled *Platform*, with single-select radio buttons for: *ODK Aggregate*, *Google Drive, Google Sheets*, and *Other*. *Google Drive, Google Sheets* is selected and circled in red. 4. Select your :guilabel:`Google Account` @@ -33,7 +33,7 @@ Connecting to a Google Drive Account :alt: The Server Settings screen in the Collect app. Below the *Type* setting is a section titled *Google Sheets settings*, with items for *Google Account* and *Fallback submission URL*. *Google Account* is circled in red. .. image:: /img/collect-connect/server-settings-google-account-modal.* - :alt: The Server Settings screen as displayed in the previous image. There is now a modal labelled *Google account,* with a set of radio button (single select) options. The options are Google Accounts associated with the device, and a final option labelled 'No account'. Below that is a button labelled CANCEL. + :alt: The Server Settings screen as displayed in the previous image. There is now a modal labeled *Google account,* with a set of radio button (single select) options. The options are Google Accounts associated with the device, and a final option labeled 'No account'. Below that is a button labeled CANCEL. 5. **Optional:** Set a :guilabel:`Fallback submission URL` diff --git a/collect-connect.rst b/collect-connect.rst index 2f8f51818..30ea31fad 100644 --- a/collect-connect.rst +++ b/collect-connect.rst @@ -17,7 +17,7 @@ The two most common options for form and data management are: collect-connect-aggregate collect-connect-google -:doc:`aggregate-guide` provides a robust data repository with tools for data visualization, querying, and export. For complex data collection and aggregation tasks, it is usually the right choice. However, setting up and maintaing an Aggregate server is not a trivial matter. +:doc:`aggregate-guide` provides a robust data repository with tools for data visualization, querying, and export. For complex data collection and aggregation tasks, it is usually the right choice. However, setting up and maintaining an Aggregate server is not a trivial matter. Using Google Drive to manage form submissions is simpler and, in most cases, cheaper. With this simplicity you sacrifice a richer feature set. Additionally, using Google Drive may not meet your privacy requirements. diff --git a/collect-filling-forms.rst b/collect-filling-forms.rst index 518fb0e3f..fb2ffa3de 100644 --- a/collect-filling-forms.rst +++ b/collect-filling-forms.rst @@ -38,7 +38,7 @@ Free-entry text and number answers are entered using the device keyboard. The ap Select response ~~~~~~~~~~~~~~~~~ -Questions with response choices can be answered by touching the selected items. These include radio buttons (single-select), dropdowns (single-select), check boxes (multi-select), and images choices (single and multi-select). +Questions with response choices can be answered by touching the selected items. These include radio buttons (single-select), dropdowns (single-select), check boxes (multi-select), and image choices (single and multi-select). .. figure:: /img/collect-completing-forms/single-select.* :alt: A question screen with radio buttons (single-select). diff --git a/collect-forms.rst b/collect-forms.rst index 1ab886f84..9def206d0 100644 --- a/collect-forms.rst +++ b/collect-forms.rst @@ -107,7 +107,7 @@ Loading form media If a form :ref:`includes images or other media `, those files have to be loaded to the device along with the form. -Media files should be placed in a folder labelled :file:`{form-name}-media`. +Media files should be placed in a folder labeled :file:`{form-name}-media`. - When using ODK Aggregate, the form upload prompt includes instructions to upload the :file:`-media` folder. The files are downloaded automatically when :ref:`fetching forms from Aggregate `. - When using Google Drive, the :file:`-media` folder should be uploaded to the same location as the form. diff --git a/form-widgets.rst b/form-widgets.rst index 9e3da1ed7..802d21348 100644 --- a/form-widgets.rst +++ b/form-widgets.rst @@ -858,7 +858,7 @@ Launches an external app and receives a string input back from the external app. The external app widget is displayed when the :th:`appearance` attribute begins with :tc:`ex:`. The rest of the :th:`appearance` string specifies the application to launch. .. image:: /img/form-widgets/external-app-widget-start.* - :alt: The External App form widget, as displayed in the ODK Collect App on an Android phone. The question text is "Ex string widget." The hinst text is, "text type with ex:change.uw.android.BREATHCOUNT appearance (can use other external apps)." Below that is a button labelled "Launch." Above the question text is the form group name "Text widgets." + :alt: The External App form widget, as displayed in the ODK Collect App on an Android phone. The question text is "Ex string widget." The hinst text is, "text type with ex:change.uw.android.BREATHCOUNT appearance (can use other external apps)." Below that is a button labeled "Launch." Above the question text is the form group name "Text widgets." .. image:: /img/form-widgets/external-app-widget-fallback.* :alt: The External App widget as displayed earlier. The Launch button has now been disabled. Below it is a simple input. A help message displays the text, "The requested application is missing. Please manually enter the reading." @@ -1241,7 +1241,7 @@ Signature Widget Collects a signature from the user. .. image:: /img/form-widgets/signature-start.* - :alt: The Signature form widget, as displayed in the ODK Collect app on an Android phone. The question text is, "Signature widget." The hint text is "image type with signature appearance." Below that is a button labelled "Gather Signature." Above the question text is the form group name "Image widgets." + :alt: The Signature form widget, as displayed in the ODK Collect app on an Android phone. The question text is, "Signature widget." The hint text is "image type with signature appearance." Below that is a button labeled "Gather Signature." Above the question text is the form group name "Image widgets." .. image:: /img/form-widgets/signature-in-progress.* :alt: A drawing pad with a signature line, displayed on an Android phone. A signature is drawn across it. In the lower right corner is circular button marked with a plus sign (+).