mirror of
https://github.com/YunoHost-Apps/ihatemoney_ynh.git
synced 2024-09-03 19:26:15 +02:00
Merge pull request #90 from aavenel/master
Bugfix : display calendar widget when editing a bill
This commit is contained in:
commit
4f811ffc72
3 changed files with 9 additions and 17 deletions
|
@ -1,16 +1,7 @@
|
|||
{% extends "layout.html" %}
|
||||
|
||||
{% block head %}
|
||||
<script src="{{ url_for("static", filename="js/jquery-ui.js") }}"></script>
|
||||
{% if g.lang != "en" %}
|
||||
<script src="{{ url_for("static", filename="js/i18n/jquery.ui.datepicker-%s.js" % g.lang ) }}"></script>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
{% block js %}
|
||||
$('#cancel-form').click(function(){location.href={{ url_for(".list_bills") }};});
|
||||
$.datepicker.setDefaults({'dateFormat': 'yy-mm-dd'});
|
||||
$(".datepicker").datepicker($.datepicker.regional['{{ g.lang }}']);
|
||||
|
||||
{% endblock %}
|
||||
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
<script src="{{ url_for("static", filename="js/jquery-1.7.2.min.js") }}"></script>
|
||||
<script src="{{ url_for("static", filename="js/ihatemoney.js") }}"></script>
|
||||
<script src="{{ url_for("static", filename="js/bootstrap.min.js") }}"></script>
|
||||
<script src="{{ url_for("static", filename="js/bootstrap-datepicker.js") }}"></script>
|
||||
{% block head %}{% endblock %}
|
||||
<script type="text/javascript" charset="utf-8">
|
||||
$(document).ready(function(){
|
||||
|
@ -19,7 +20,14 @@
|
|||
});
|
||||
}, 4000);
|
||||
|
||||
$('.dropdown-toggle').dropdown()
|
||||
$('.datepicker').datepicker({
|
||||
format: 'yyyy-mm-dd',
|
||||
weekStart: 1,
|
||||
autoclose: true,
|
||||
language: '{{ g.lang }}'
|
||||
});
|
||||
|
||||
$('.dropdown-toggle').dropdown();
|
||||
|
||||
{% block js %}{% endblock %}
|
||||
});
|
||||
|
|
|
@ -34,13 +34,6 @@
|
|||
$(this).find('.action').hide();
|
||||
});
|
||||
|
||||
$('.datepicker').datepicker({
|
||||
format: 'yyyy-mm-dd',
|
||||
weekStart: 1,
|
||||
autoclose: true,
|
||||
language: '{{ g.lang }}'
|
||||
});
|
||||
|
||||
var highlight_owers = function(){
|
||||
var ower_ids = $(this).attr("owers").split(',');
|
||||
var payer_id = $(this).attr("payer");
|
||||
|
|
Loading…
Reference in a new issue