From 8f91076c6b67d4a7b9c405e3b7d9e193b584c990 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 22 Mar 2016 14:27:53 +0100 Subject: [PATCH 1/2] Code refactoring --- Resources/public/js/chill.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/public/js/chill.js b/Resources/public/js/chill.js index 6c7bd0913..a22ed52da 100644 --- a/Resources/public/js/chill.js +++ b/Resources/public/js/chill.js @@ -181,4 +181,4 @@ var chill = function() { displayAlertWhenLeavingUnsubmittedForm: displayAlertWhenLeavingUnsubmittedForm, checkNullValuesInChoices: checkNullValuesInChoices, }; -} (); \ No newline at end of file +} (); From f205a1ccca33059949b9787414329202ebc1b984 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 22 Mar 2016 14:29:00 +0100 Subject: [PATCH 2/2] Refactoring : adding the JS in the pabe bottom part --- Resources/views/layout.html.twig | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig index 665d36a6a..cb7a59448 100644 --- a/Resources/views/layout.html.twig +++ b/Resources/views/layout.html.twig @@ -36,16 +36,6 @@ {% endstylesheets %} {% block css%}{% endblock %} - - {% javascripts output="js/libs.js" - "bundles/chillmain/js/jquery.js" - "bundles/chillmain/js/moment.js" - "bundles/chillmain/js/pikaday/pikaday.js" - "bundles/chillmain/js/select2/select2.js" - "bundles/chillmain/js/pikaday/plugins/pikaday.jquery.js" - "bundles/chillmain/js/chill.js" %} - - {% endjavascripts %} @@ -161,6 +151,16 @@

{{ 'Programme sous license' | trans }} AGPL

+ + {% javascripts output="js/libs.js" + "bundles/chillmain/js/jquery.js" + "bundles/chillmain/js/moment.js" + "bundles/chillmain/js/pikaday/pikaday.js" + "bundles/chillmain/js/select2/select2.js" + "bundles/chillmain/js/pikaday/plugins/pikaday.jquery.js" + "bundles/chillmain/js/chill.js" %} + + {% endjavascripts %} {% block js%}{% endblock %} - - - \ No newline at end of file +