Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-13 03:09:51 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge remote-tracking branch 'framagit/master'

Browse Source
This commit is contained in:
Julien Fastré 2016-03-23 15:16:58 +01:00
commit 0fa3a9b0ed
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/public/js/chill.js
View File

@ -181,4 +181,4 @@ var chill = function() {
displayAlertWhenLeavingUnsubmittedForm: displayAlertWhenLeavingUnsubmittedForm, displayAlertWhenLeavingUnsubmittedForm: displayAlertWhenLeavingUnsubmittedForm,
checkNullValuesInChoices: checkNullValuesInChoices, checkNullValuesInChoices: checkNullValuesInChoices,
}; };
} (); } ();

24
Resources/views/layout.html.twig
View File

@ -36,16 +36,6 @@
{% endstylesheets %} {% endstylesheets %}
{% block css%}<!-- nothing added to css -->{% endblock %} {% block css%}<!-- nothing added to 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" %}
<script src="{{ asset_url }}" type="text/javascript"></script>
{% endjavascripts %}
</head> </head>
<body> <body>
@ -161,6 +151,16 @@
<footer class="footer"> <footer class="footer">
<p>{{ 'Programme sous license' | trans }} <b>AGPL</b></p> <p>{{ 'Programme sous license' | trans }} <b>AGPL</b></p>
</footer> </footer>
{% 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" %}
<script src="{{ asset_url }}" type="text/javascript"></script>
{% endjavascripts %}
<script type="text/javascript"> <script type="text/javascript">
chill.initPikaday('{{ app.request.locale }}'); chill.initPikaday('{{ app.request.locale }}');
@ -170,7 +170,5 @@
</script> </script>
{% block js%}<!-- nothing added to js -->{% endblock %} {% block js%}<!-- nothing added to js -->{% endblock %}
</body> </body>
</html> </html>