Skip to content
This repository has been archived by the owner on Sep 30, 2021. It is now read-only.

Commit

Permalink
Merge 4affe4f into 16c7611
Browse files Browse the repository at this point in the history
  • Loading branch information
Fuck4ik committed Sep 15, 2017
2 parents 16c7611 + 4affe4f commit 00dd9e5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions Form/Type/BasePickerType.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ protected function getCommonDefaults()
'widget' => 'single_text',
'datepicker_use_button' => true,
'dp_pick_time' => true,
'dp_pick_date' => true,
'dp_use_current' => true,
'dp_min_date' => '1/1/1900',
'dp_max_date' => null,
Expand Down
6 changes: 4 additions & 2 deletions Resources/views/Form/datepicker.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,14 @@ file that was distributed with this source code.

{% block sonata_type_datetime_picker_widget_html %}
{% if datepicker_use_button %}
<div class='input-group date' id='dtp_{{ id }}'>
<div class='input-group date {% if not dp_options['pickDate'] %}timepicker{% endif %}' id='dtp_{{ id }}'>
{% endif %}
{% set attr = attr|merge({'data-date-format': moment_format}) %}
{{ block('datetime_widget') }}
{% if datepicker_use_button %}
<span class="input-group-addon"><span class="fa fa-calendar"></span></span>
<span class="input-group-addon">
<span class="fa {% if dp_options['pickDate'] %}fa-calendar{% else %}fa-clock{% endif %}"></span>
</span>
</div>
{% endif %}
{% endblock sonata_type_datetime_picker_widget_html %}
Expand Down

0 comments on commit 00dd9e5

Please sign in to comment.