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

Merge branch 'dev' into 'master'

Dev to Master

See merge request documentation/doc!54
parents 7f814ba8 c67867b4
No related branches found
No related tags found
No related merge requests found
......@@ -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.
``clustering``
~~~~~~~~~~~~~~
*Available from version 0.16*
If this attribute is defined, markers spacially close are grouped in clusters.
Events
-------
......
......@@ -76,6 +76,10 @@ solid-link
- ``next``: The ``name`` attribute of the ``<solid-route>`` you
want to access.
- ``data-src``: The resource you want to use in your view. Often
used to show more details about this resource, by adding the
``bind-resource`` attribute to a component.
Example:
.. code:: html
......
......@@ -71,7 +71,7 @@ Attributes
``default-[field]``
~~~~~~~~~~~~~~~~~~~
Value displayed for ``[field]`` when it’s empty or not defined
Value displayed for ``[field]`` when it’s empty or not defined.
``widget-[field]``
~~~~~~~~~~~~~~~~~~
......@@ -95,11 +95,11 @@ Attributes
``label-[field]``
~~~~~~~~~~~~~~~~~
Set the label for the ``[field]``
Set the label for the ``[field]``.
``placeholder-[field]``
~~~~~~~~~~~~~~~~~~~~~~~
Set the placeholder for the ``[field]``
Set the placeholder for the ``[field]``.
``class-[field]``
~~~~~~~~~~~~~~~~~
......@@ -126,6 +126,11 @@ Attributes
editable-name
></solid-display>
``alt-[field]``
~~~~~~~~~~~~~~~
*Works only with solid-display-img*
Set the alt for the field ``[field]``.
``multiple-[field]``
~~~~~~~~~~~~~~~~~~~~
......
......@@ -29,10 +29,10 @@ Name of the template to use. Available templates:
- ``display`` directory
- ``value``: displays ``value`` directly in the widget tag.
- ``div``: displays ``value`` inside a ``<div>`` tag
- ``link``: displays ``value`` as an ``href`` attribute in a ``<a>`` tag
- ``img``: displays ``value`` as a ``src`` attribute in a ``<img>`` tag
- ``boolean``: displays label (or name) in a ``<label>`` tag if ``value == true``
- ``div``: displays ``value`` inside a ``<div>`` tag.
- ``link``: displays ``value`` as an ``href`` attribute in a ``<a>`` tag.
- ``img``: displays ``value`` as a ``src`` attribute in a ``<img>`` tag.
- ``boolean``: displays label (or name) in a ``<label>`` tag if ``value == true``.
- ``form`` directory
......@@ -52,12 +52,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.
- ``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.
- ``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"/>``.
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.
- ``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``
......@@ -92,3 +93,4 @@ Features to add to the widget. You can choose as many as you want
- ``addable``: adds a ``<solid-form>`` that allows to add data on the field concerned.
It accepts attributes from :ref:`solid-form <solid-form>` by using ``addable-[field]-[attribute]="value"`` format.
If ``addable-data-src`` is not provided, the solid-form will use the URI in ``range-[field]`` as data-src, if declared.
- ``oembed``: displays the video content of an oEmbed link filled with the associated ``value-[field]`` attribute.
\ No newline at end of file
......@@ -5,11 +5,19 @@ List of attributes (core framework)
~~~~~~~~~~~~~~~~~~
* :ref:`widget-mixin <widget-mixin>`
``alt-[field]``
~~~~~~~~~~~~~~~
* :ref:`widget-mixin <widget-mixin>`
``autocomplete-[field]``
~~~~~~~~~~~~~~~~~~~~~~~~
* :ref:`solid-form <solid-form>`
* :ref:`solid-form-search <solid-form-search>`
``autosave``
~~~~~~~~~~~~
* :ref:`solid-form <solid-form>`
``child-[field]``
~~~~~~~~~~~~~~~~~
* :ref:`solid-display <solid-display>`
......@@ -18,6 +26,10 @@ List of attributes (core framework)
~~~~~~~~~~~~~~~~~
* :ref:`widget-mixin <widget-mixin>`
``clustering``
~~~~~~~~~~~~~~
* :ref:`solid-map <solid-map>`
``confirmation-message``
~~~~~~~~~~~~~~~~~~~~~~~~
* :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