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

This commit is contained in:
Marc Ducobu 2014-11-11 12:54:55 +01:00
commit 6bf9558058
2 changed files with 19 additions and 1 deletions

View File

@ -35,7 +35,6 @@ class ChillCustomFieldsExtension extends Extension implements PrependExtensionIn
$config['customizables_entities']);
}
/* (non-PHPdoc)
* @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
*/

View File

@ -1,9 +1,28 @@
{#
* Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{# CustomFields Title #}
{% block custom_field_title_widget %}
<span class="cf-{{ form.vars.attr.type }}">
{{ form.vars.attr.title }}
</span>
{% endblock custom_field_title_widget %}
{# CustomFields Choice #}
{# render an alement in a choice list #}
{% block cf_choices_list_widget %}