Skip to content

Commit db94ad9

Browse files
Changes per feedback.
1 parent 7228e0b commit db94ad9

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

app/Resources/FOSUserBundle/views/Security/login.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{% block fos_user_content %}
55
{% if error %}
6-
<div>{{ error.messageKey|trans(error.messageData, 'security') }}</div>
6+
<div>{{ error|trans({}, 'FOSUserBundle') }}</div>
77
{% endif %}
88

99
<form action="{{ path("fos_user_security_check") }}" method="post" class="form-signin">

src/ApiBundle/Form/UserProfileType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
2828
->add('image', FileType::class, array('data_class' => null,'label' => 'Image, if any ', 'required' => false) )
2929
->add('firstname',TextType::class)
3030
->add('lastname',TextType::class, array('required' => false))
31-
->add('dob', DateType::class, array('widget' => 'single_text', 'format' => 'M/d/y'))
31+
->add('dob', DateType::class, array('widget' => 'single_text', 'format' => 'M/d/y', 'html5' => false, 'attr' => array('class' => 'js-datepicker')))
3232
->add('email', EmailType::class)
3333
->add('username', TextType::class)
3434
;

src/ApiBundle/Resources/views/admin/user/edit.html.twig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,16 @@
7575
</a>
7676
{% endblock %}
7777

78+
{% block javascripts %}
79+
{{ parent() }}
80+
<script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.6.0/js/bootstrap-datepicker.min.js"></script>
81+
<script>
82+
jQuery(document).ready(function() {
83+
$('.js-datepicker').datepicker();
84+
});
85+
</script>
86+
{% endblock %}
87+
7888
{% block sidebar %}
7989
<div class="section actions">
8090
{{ include('ApiBundle:admin/user:_form.html.twig', {

src/ApiBundle/Resources/views/user/edit.html.twig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,13 @@
6363
/>
6464
{{ form_end(edit_form) }}
6565
{% endblock %}
66+
67+
{% block javascripts %}
68+
{{ parent() }}
69+
<script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.6.0/js/bootstrap-datepicker.min.js"></script>
70+
<script>
71+
jQuery(document).ready(function() {
72+
$('.js-datepicker').datepicker();
73+
});
74+
</script>
75+
{% endblock %}

0 commit comments

Comments
 (0)