Merge branch 'master' of git://github.com/Chill-project/Main

This commit is contained in:
Marc Ducobu
2015-07-06 09:51:20 +02:00
6 changed files with 1066 additions and 1027 deletions

View File

@@ -87,6 +87,18 @@
{% endif %}
{% endspaceless %}
{% endblock date_widget %}
{%- block time_widget -%}
{%- if widget == 'single_text' -%}
{{ block('form_widget_simple') }}
{%- else -%}
{%- set vars = widget == 'text' ? { 'attr': { 'size': 1 }} : {} -%}
{% set attr = {'class' : 'time_compound ' ~ attr.class|default('') } %}
<div {{ block('widget_container_attributes') }}>
{{ form_widget(form.hour, vars) }}{% if with_minutes %}<span class="separator">:</span>{{ form_widget(form.minute, vars) }}{% endif %}{% if with_seconds %}<span class="separator">:</span>{{ form_widget(form.second, vars) }}{% endif %}
</div>
{%- endif -%}
{%- endblock time_widget -%}
{% block form_errors %}
{% spaceless %}