Skip to content

Commit

Permalink
Merge branch '2.4' into 2.5
Browse files Browse the repository at this point in the history 
* 2.4:
  [Reference] order form type options alphabetically

Conflicts:
	reference/forms/types/collection.rst
	reference/forms/types/email.rst
	reference/forms/types/file.rst
	reference/forms/types/form.rst
	reference/forms/types/password.rst
	reference/forms/types/search.rst
	reference/forms/types/text.rst
	reference/forms/types/textarea.rst
	reference/forms/types/url.rst
  • Loading branch information
@weaverryan
weaverryan committed Aug 14, 2014
2 parents d0ca865 + fb387a8 commit bdd729a
Show file tree
Hide file tree
Showing 28 changed files with 790 additions and 751 deletions.
45 changes: 25 additions & 20 deletions reference/forms/types/birthday.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,28 @@ option defaults to 120 years ago to the current year.
+----------------------+-------------------------------------------------------------------------------+
| Rendered as | can be three select boxes or 1 or 3 text boxes, based on the `widget`_ option |
+----------------------+-------------------------------------------------------------------------------+
| Overridden Options | - `years`_ |
| Overridden options | - `years`_ |
+----------------------+-------------------------------------------------------------------------------+
| Inherited Options | - `widget`_ |
| | - `input`_ |
| | - `empty_value`_ |
| | - `months`_ |
| Inherited options | from the :doc:`date </reference/forms/types/date>` type: |
| | |
| | - `days`_ |
| | - `empty_value`_ |
| | - `format`_ |
| | - `input`_ |
| | - `model_timezone`_ |
| | - `months`_ |
| | - `view_timezone`_ |
| | - `widget`_ |
| | |
| | from the :doc:`form </reference/forms/types/form>` type: |
| | |
| | - `data`_ |
| | - `disabled`_ |
| | - `inherit_data`_ |
| | - `invalid_message`_ |
| | - `invalid_message_parameters`_ |
| | - `read_only`_ |
| | - `disabled`_ |
| | - `mapped`_ |
| | - `inherit_data`_ |
| | - `read_only`_ |
+----------------------+-------------------------------------------------------------------------------+
| Parent type | :doc:`date </reference/forms/types/date>` |
+----------------------+-------------------------------------------------------------------------------+
Expand All @@ -59,34 +64,34 @@ Inherited Options

These options inherit from the :doc:`date </reference/forms/types/date>` type:

.. include:: /reference/forms/types/options/date_widget.rst.inc

.. include:: /reference/forms/types/options/date_input.rst.inc
.. include:: /reference/forms/types/options/days.rst.inc

.. include:: /reference/forms/types/options/empty_value.rst.inc

.. include:: /reference/forms/types/options/months.rst.inc

.. include:: /reference/forms/types/options/days.rst.inc

.. include:: /reference/forms/types/options/date_format.rst.inc

.. include:: /reference/forms/types/options/date_input.rst.inc

.. include:: /reference/forms/types/options/model_timezone.rst.inc

.. include:: /reference/forms/types/options/months.rst.inc

.. include:: /reference/forms/types/options/view_timezone.rst.inc

.. include:: /reference/forms/types/options/date_widget.rst.inc

These options inherit from the :doc:`form </reference/forms/types/form>` type:

.. include:: /reference/forms/types/options/data.rst.inc

.. include:: /reference/forms/types/options/invalid_message.rst.inc
.. include:: /reference/forms/types/options/disabled.rst.inc

.. include:: /reference/forms/types/options/invalid_message_parameters.rst.inc
.. include:: /reference/forms/types/options/inherit_data.rst.inc

.. include:: /reference/forms/types/options/read_only.rst.inc
.. include:: /reference/forms/types/options/invalid_message.rst.inc

.. include:: /reference/forms/types/options/disabled.rst.inc
.. include:: /reference/forms/types/options/invalid_message_parameters.rst.inc

.. include:: /reference/forms/types/options/mapped.rst.inc

.. include:: /reference/forms/types/options/inherit_data.rst.inc
.. include:: /reference/forms/types/options/read_only.rst.inc
34 changes: 17 additions & 17 deletions reference/forms/types/checkbox.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ if the box is unchecked, the value will be set to false.
+-------------+------------------------------------------------------------------------+
| Options | - `value`_ |
+-------------+------------------------------------------------------------------------+
| Overridden | - `empty_data`_ |
| options | - `compound`_ |
| Overridden | - `compound`_ |
| options | - `empty_data`_ |
+-------------+------------------------------------------------------------------------+
| Inherited | - `data`_ |
| options | - `required`_ |
| | - `label`_ |
| | - `label_attr`_ |
| | - `read_only`_ |
| | - `disabled`_ |
| options | - `disabled`_ |
| | - `error_bubbling`_ |
| | - `error_mapping`_ |
| | - `label`_ |
| | - `label_attr`_ |
| | - `mapped`_ |
| | - `read_only`_ |
| | - `required`_ |
+-------------+------------------------------------------------------------------------+
| Parent type | :doc:`form </reference/forms/types/form>` |
+-------------+------------------------------------------------------------------------+
Expand All @@ -49,33 +49,33 @@ Field Options
Overridden Options
------------------

.. include:: /reference/forms/types/options/checkbox_empty_data.rst.inc

.. include:: /reference/forms/types/options/checkbox_compound.rst.inc

.. include:: /reference/forms/types/options/checkbox_empty_data.rst.inc

Inherited Options
-----------------

These options inherit from the :doc:`form </reference/forms/types/form>` type:

.. include:: /reference/forms/types/options/data.rst.inc

.. include:: /reference/forms/types/options/required.rst.inc

.. include:: /reference/forms/types/options/label.rst.inc

.. include:: /reference/forms/types/options/label_attr.rst.inc

.. include:: /reference/forms/types/options/read_only.rst.inc

.. include:: /reference/forms/types/options/disabled.rst.inc

.. include:: /reference/forms/types/options/error_bubbling.rst.inc

.. include:: /reference/forms/types/options/error_mapping.rst.inc

.. include:: /reference/forms/types/options/label.rst.inc

.. include:: /reference/forms/types/options/label_attr.rst.inc

.. include:: /reference/forms/types/options/mapped.rst.inc

.. include:: /reference/forms/types/options/read_only.rst.inc

.. include:: /reference/forms/types/options/required.rst.inc

Form Variables
--------------

Expand Down
62 changes: 31 additions & 31 deletions reference/forms/types/choice.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ option.
+-------------+------------------------------------------------------------------------------+
| Options | - `choices`_ |
| | - `choice_list`_ |
| | - `multiple`_ |
| | - `empty_value`_ |
| | - `expanded`_ |
| | - `multiple`_ |
| | - `preferred_choices`_ |
| | - `empty_value`_ |
+-------------+------------------------------------------------------------------------------+
| Overridden | - `empty_data`_ |
| options | - `compound`_ |
| Overridden | - `compound`_ |
| options | - `empty_data`_ |
| | - `error_bubbling`_ |
+-------------+------------------------------------------------------------------------------+
| Inherited | - `required`_ |
| options | - `label`_ |
| | - `label_attr`_ |
| | - `data`_ |
| | - `read_only`_ |
| Inherited | - `by_reference`_ |
| options | - `data`_ |
| | - `disabled`_ |
| | - `error_mapping`_ |
| | - `mapped`_ |
| | - `inherit_data`_ |
| | - `by_reference`_ |
| | - `label`_ |
| | - `label_attr`_ |
| | - `mapped`_ |
| | - `read_only`_ |
| | - `required`_ |
+-------------+------------------------------------------------------------------------------+
| Parent type | :doc:`form </reference/forms/types/form>` |
+-------------+------------------------------------------------------------------------------+
Expand Down Expand Up @@ -103,17 +103,25 @@ The ``choice_list`` option must be an instance of the ``ChoiceListInterface``.
For more advanced cases, a custom class that implements the interface
can be created to supply the choices.

.. include:: /reference/forms/types/options/multiple.rst.inc
.. include:: /reference/forms/types/options/empty_value.rst.inc

.. include:: /reference/forms/types/options/expanded.rst.inc

.. include:: /reference/forms/types/options/preferred_choices.rst.inc
.. include:: /reference/forms/types/options/multiple.rst.inc

.. include:: /reference/forms/types/options/empty_value.rst.inc
.. include:: /reference/forms/types/options/preferred_choices.rst.inc

Overridden Options
------------------

compound
~~~~~~~~

**type**: ``boolean`` **default**: same value as ``expanded`` option

This option specifies if a form is compound. The value is by default
overridden by the value of the ``expanded`` option.

.. include:: /reference/forms/types/options/empty_data.rst.inc
:end-before: DEFAULT_PLACEHOLDER

Expand All @@ -126,14 +134,6 @@ The actual default value of this option depends on other field options:
.. include:: /reference/forms/types/options/empty_data.rst.inc
:start-after: DEFAULT_PLACEHOLDER

compound
~~~~~~~~

**type**: ``boolean`` **default**: same value as ``expanded`` option

This option specifies if a form is compound. The value is by default
overridden by the value of the ``expanded`` option.

error_bubbling
~~~~~~~~~~~~~~

Expand All @@ -147,25 +147,25 @@ Inherited Options

These options inherit from the :doc:`form </reference/forms/types/form>` type:

.. include:: /reference/forms/types/options/required.rst.inc

.. include:: /reference/forms/types/options/label.rst.inc

.. include:: /reference/forms/types/options/label_attr.rst.inc
.. include:: /reference/forms/types/options/by_reference.rst.inc

.. include:: /reference/forms/types/options/data.rst.inc

.. include:: /reference/forms/types/options/read_only.rst.inc

.. include:: /reference/forms/types/options/disabled.rst.inc

.. include:: /reference/forms/types/options/error_mapping.rst.inc

.. include:: /reference/forms/types/options/inherit_data.rst.inc

.. include:: /reference/forms/types/options/label.rst.inc

.. include:: /reference/forms/types/options/label_attr.rst.inc

.. include:: /reference/forms/types/options/mapped.rst.inc

.. include:: /reference/forms/types/options/inherit_data.rst.inc
.. include:: /reference/forms/types/options/read_only.rst.inc

.. include:: /reference/forms/types/options/by_reference.rst.inc
.. include:: /reference/forms/types/options/required.rst.inc

Field Variables
---------------
Expand Down
Loading

0 comments on commit bdd729a

Please sign in to comment.