Skip to content

Commit

Permalink
Merge branch 'MvM-Maria-StudioProReference' into development
Browse files Browse the repository at this point in the history
# Conflicts:
#	content/refguide/reference-selector.md
  • Loading branch information
MarkvanMents committed Sep 24, 2019
2 parents c149ec1 + b097ffa commit 58e60b2
Show file tree
Hide file tree
Showing 21 changed files with 202 additions and 127 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions content/refguide/check-box.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ This differs from the [On change](#on-change) property in that the event will al

### 2.6 Label Section{#label}

{{% snippet file="refguide/label-property.md" %}}
{{% snippet file="refguide/label-section-link.md" %}}

### 2.7 Visibility Section{#visibility}

{{% snippet file="refguide/visibility-section-link.md" %}}

## Read More
## 3 Read More

* [Data view](data-view)
* [Attributes](attributes)
2 changes: 1 addition & 1 deletion content/refguide/database-source.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ If set to true, the grid will remain empty of contents until a search has been p

_Default value:_ false

### Constraints
### Constraints{#constraints}

Constraints allow for custom, hard-coded limitations on the data displayed. This constraint will be applied after constraints already applied through security. Each constraint consists of an attribute, an operator and a value. Multiple constraints will limit the data even more ("and"). There is no way to create "or" constraints, except by switching to an [XPath data source](xpath-source).

Expand Down
6 changes: 3 additions & 3 deletions content/refguide/date-picker.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ tags: ["studio pro"]

## 1 Introduction

A **date picker** is used to display and, optionally, allow the end-user to edit the value of an attribute of [data type](data-types) *Date and Time*. It uses the values set in the **Languages** tab of **Project Settings** to display a correctly localized value to the end-user, using the **Language** entity associated with the end-user.
A **date picker** is used to display and, optionally, allow the end-user to edit the value of an attribute of [data type](data-types) *Date and Time*. It uses the values set in the **Languages** tab of **Project Settings** to display a correctly localized value to the end-user, using the **Language** object associated with the end-user.

A date picker must be placed in a [data widget](data-widgets) and displays an attribute of the object(s) retrieved by that widget. The name of the attribute to be displayed is shown inside the date picker, between square brackets, and colored blue.

For example, the following text box allows the end-user to see, and set, the **LastContacted** date of a customer.
For example, the following date picker allows the end-user to see, and set, the **LastContacted** date of a customer.

![](attachments/date-picker/date-picker.png)

Expand Down Expand Up @@ -116,7 +116,7 @@ Placeholder text will not be displayed if a native date picker is available (tha

{{% snippet file="refguide/visibility-section-link.md" %}}

## 9 Read More
## 3 Read More

* [Data View](data-view)
* [Attributes](attributes)
8 changes: 4 additions & 4 deletions content/refguide/drop-down.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ A drop down must be placed in a [data widget](data-widgets) and displays an attr
A drop down should not be confused with a [reference selector](reference-selector), which is used to select an [association](associations) to another object.
{{% /alert %}}

For example, the following drop down allows the end-user to see, and set, the **Region** to which a customer is allocated.
For example, the following drop down allows the end-user to see, and set, the **Region** to which a customer is allocated. The possible values for **Region** are held in an enumeration.

![](attachments/drop-down/drop-down.png)

Expand Down Expand Up @@ -83,13 +83,13 @@ Empty option caption is the text that is shown for the empty option in the drop-

Adding a caption for the empty option improves the user experience of your application. It also helps end-users using a screen-reader to operate the application easily.

For example, the drop-down that allows the end-user to select the region allocated to a customer could have a caption `Select a region`.
For example, the drop-down that allows the end-user to select the region allocated to a customer, where the possible values for **Region** are held in an enumeration, could have the caption `Select a region`.

![](attachments/drop-down/select-a-region.png)

### 2.7 Label Section{#label}

{{% snippet file="refguide/label-property.md" %}}
{{% snippet file="refguide/label-section-link.md" %}}

### 2.8 Validation Section{#validation}

Expand All @@ -99,7 +99,7 @@ For example, the drop-down that allows the end-user to select the region allocat

{{% snippet file="refguide/visibility-section-link.md" %}}

## Read More
## 3 Read More

* [Data View](data-view)
* [Attributes](attributes)
20 changes: 10 additions & 10 deletions content/refguide/input-widgets.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,41 +16,41 @@ For example, the input widgets can be placed inside a [data view](data-view):

![Data view containing widgets](attachments/input-widgets/data-view.png)

There are several different input widgets, these are used for different [data types](data-types) and for different types of [association](). The input widgets category contains the following widgets:
There are several different input widgets, these are used for different [data types](data-types) and for different types of [association](association-properties). The input widgets category contains the following widgets:

* [**Text Box**](text-box) – displays and, optionally, allows the user to add or edit, text data from a *numeric* or *string-like* attribute:
* [**Text Box**](text-box) – displays and, optionally, allows the end-user to add or edit text data from a *numeric* or *string-like* attribute:

![Text box containing Name attribute](attachments/input-widgets/text-box.png)

* [**Text Area**](text-area) – displays and, optionally, allows the user to add or edit, long text data from a *string* attribute:
* [**Text Area**](text-area) – displays and, optionally, allows the end-user to add or edit long text data from a *string* attribute:

![Text area containing notes attribute](attachments/input-widgets/text-area.png)

* [**Drop Down**](drop-down) – shows the current value of and, optionally, allows users to pick an option from, a list of options in an *enumeration* attribute:
* [**Drop Down**](drop-down) – shows the current value of and, optionally, allows end-users to pick an option from a list of options in an *enumeration* attribute:

![Drop down containing region attribute](attachments/input-widgets/drop-down.png)

* [**Check Box**](check-box) – shows the current value of and, optionally, allows users to set, a *Boolean* attribute to `true` or `false`:
* [**Check Box**](check-box) – shows the current value of and, optionally, allows end-users to set a *Boolean* attribute to `true` or `false`:

![Check box showing personal attribute](attachments/input-widgets/check-box.png)

* [**Radio Buttons**](radio-buttons) – shows the current value of and, optionally, allows users to pick an option from, a list of options in an *enumeration* attribute or the value of a *Boolean* attribute:
* [**Radio Buttons**](radio-buttons) – shows the current value of and, optionally, allows end-users to pick an option from a list of options in an *enumeration* attribute or the value of a *Boolean* attribute:

![Radio buttons showing the preferred contact time and personal attributes](attachments/input-widgets/radio-buttons.png)

* [**Date Picker**](date-picker) – shows and, optionally, allows users to pick, a *DateAndTime* attribute from a calendar:
* [**Date Picker**](date-picker) – shows and, optionally, allows end-users to pick a *Date and time* attribute from a calendar:

![Date picker showing the last contacted attribute](attachments/input-widgets/date-picker.png)

* [**Reference Selector**](reference-selector) – shows and, optionally, can be used to select a *one-to-one* or single *one-to-many* association, selected from the value of a *string*, *numeric*, *enumeration*, or *Data and Time* attribute on the associated object:
* [**Reference Selector**](reference-selector) – shows and, optionally, allows end-users to select a *one-to-one* or *one-to-many* association using the value of a *string*, *numeric*, *enumeration*, or *Date and time* attribute on the associated object:

![Reference selector showing company name attribute of associated company](attachments/input-widgets/reference-selector.png)

* [**Reference Set Selector**](reference-set-selector) – lists with one or more attributes from and, optionally, allows the user to add and remove, associated objects linked via a *many-to-many* association:
* [**Reference Set Selector**](reference-set-selector) – lists with one or more attributes and, optionally, allows the end-user to add and remove associated objects linked via a *many-to-many* association:

![Reference set selector showing details of associated products](attachments/input-widgets/reference-set-selector.png)

* [**Input Reference Set Selector**](input-reference-set-selector) – shows using an attribute from and, optionally, allows the user to add and remove, associated objects linked via a *many-to-many* association:
* [**Input Reference Set Selector**](input-reference-set-selector) – shows an attribute from and, optionally, allows the user to add and remove associated objects linked via a *many-to-many* association:

![Input reference set selector showing the name attribute of associated products](attachments/input-widgets/input-reference-set-selector.png)

Expand Down
4 changes: 1 addition & 3 deletions content/refguide/radio-buttons.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@ tags: ["studio pro"]

{{% alert type="warning" %}}The radio buttons widget is not supported on native mobile pages.{{% /alert %}}

The **Radio Buttons** widget is an [input widget](input-widgets) that can be used to display and edit Boolean and enumeration attributes.

**Radio Buttons** are used to display and, optionally, allow the end-user to edit the value of an attribute of [data type](data-types) *Boolean* or *Enumeration*.

When the page is displayed to the end-user, all the possible values are listed with a filled-in circle next to the selected value and an empty circle next to the unselected value(s). Only one value can be chosen – choosing another value deselects the current value. For example:
When the page is displayed to the end-user, all the possible values are listed, with a filled-in circle next to the selected value and an empty circle next to the unselected value(s). Only one value can be chosen – choosing another value deselects the current value. For example:

![](attachments/radio-buttons/radio-buttons-displayed.png)

Expand Down
Loading

0 comments on commit 58e60b2

Please sign in to comment.