Skip to content
Snippets Groups Projects
Commit c67867b4 authored by Matthieu Fesselier's avatar Matthieu Fesselier
Browse files

Merge branch 'password-widget-markerscluster' into 'dev'

Add password widget and solid-map cluster option

See merge request documentation/doc!52
parents 257daafe 697a503d
No related branches found
No related tags found
2 merge requests!54Dev to Master,!52Add password widget and solid-map cluster option
...@@ -50,6 +50,12 @@ added to interact with the list of data being displayed. ...@@ -50,6 +50,12 @@ added to interact with the list of data being displayed.
~~~~~~~~~~ ~~~~~~~~~~
List of the fields to display in a popup which opens when a marker is clicked. If the attribute is not defined, no popup will show up. List of the fields to display in a popup which opens when a marker is clicked. If the attribute is not defined, no popup will show up.
``clustering``
~~~~~~~~~~~~~~
*Available from version 0.16*
If this attribute is defined, markers spacially close are grouped in clusters.
Events Events
------- -------
......
...@@ -51,12 +51,13 @@ Name of the template to use. Available templates: ...@@ -51,12 +51,13 @@ Name of the template to use. Available templates:
- ``radio``: set ``value`` in a list of radio buttons. The list is provided via the ``range`` attribute, which expects a container’s URL, or via the ``enum`` attribute, which takes a list of the values separated by commas. - ``radio``: set ``value`` in a list of radio buttons. The list is provided via the ``range`` attribute, which expects a container’s URL, or via the ``enum`` attribute, which takes a list of the values separated by commas.
- ``multiple``: Accept a container URI as a ``value``, and inserts one widget per resource with a “remove” button for each widget, and an “add” button. - ``multiple``: Accept a container URI as a ``value``, and inserts one widget per resource with a “remove” button for each widget, and an “add” button.
- ``multipleselect``: Accept a container URI as a ``value``, and inserts a dropdown widget with the ``multiple`` attribute. - ``multipleselect``: Accept a container URI as a ``value``, and inserts a dropdown widget with the ``multiple`` attribute.
- ``checkboxes``: Accept a container URI as a ``value``, allow to select multiple values with in a list of checkbox inputs. The list is provided via the ``range`` attribute, which expects a container’s URL, or via the ``enum`` attribute, which takes a list of the values separated by commas. - ``checkboxes``: Accept a container URI as a ``value``, allow to select multiple values with in a list of checkbox inputs. The list is provided via the ``range`` attribute, which expects a container’s URL, or via the ``enum`` attribute, which takes a list of the values separated by commas.
- ``file``: Inserts an ``<input/>`` and an ``<input type="file"/>``. - ``file``: Inserts an ``<input/>`` and an ``<input type="file"/>``.
When a file is selected it’s uploaded, URL of file is returned by request and set as the ``<input/>`` value. When a file is selected it’s uploaded, URL of file is returned by request and set as the ``<input/>`` value.
The upload URL is provided via the ``upload-url`` attribute. The upload URL is provided via the ``upload-url`` attribute.
- ``image``: Works like ``file`` but allow only images in the input, and create a preview of the image when selected by the user. - ``image``: Works like ``file`` but allow only images in the input, and create a preview of the image when selected by the user.
- ``color``: set ``value`` in a ``<input>`` of type ``color``. - ``color``: set ``value`` in an ``<input>`` of type ``color``.
- ``password``: set ``value`` in an ``<input>`` of type ``password``.
- ``set`` - ``set``
......
...@@ -14,6 +14,10 @@ List of attributes (core framework) ...@@ -14,6 +14,10 @@ List of attributes (core framework)
* :ref:`solid-form <solid-form>` * :ref:`solid-form <solid-form>`
* :ref:`solid-form-search <solid-form-search>` * :ref:`solid-form-search <solid-form-search>`
``autosave``
~~~~~~~~~~~~
* :ref:`solid-form <solid-form>`
``child-[field]`` ``child-[field]``
~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~
* :ref:`solid-display <solid-display>` * :ref:`solid-display <solid-display>`
...@@ -22,6 +26,10 @@ List of attributes (core framework) ...@@ -22,6 +26,10 @@ List of attributes (core framework)
~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~
* :ref:`widget-mixin <widget-mixin>` * :ref:`widget-mixin <widget-mixin>`
``clustering``
~~~~~~~~~~~~~~
* :ref:`solid-map <solid-map>`
``confirmation-message`` ``confirmation-message``
~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~
* :ref:`solid-form <solid-form>` * :ref:`solid-form <solid-form>`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment