inpt/ponytracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: js for milestone datetime picker

Browse source
This commit is contained in:
Élie Bouttier 2014-09-06 23:16:36 -07:00
parent 9bbabd9c69
commit b686c5fd57
5 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
templates/base.html
View file

@ -24,8 +24,6 @@
{% block css %}{% endblock %} {% block css %}{% endblock %}
{% block js %}{% endblock %} {% block js %}{% endblock %}
{% block media %}{% endblock %}
</head> </head>
<body> <body>

6
templates/base_error.html
View file

@ -22,11 +22,7 @@
<link href="{% static 'css/ponytracker.css' %}" rel="stylesheet"> <link href="{% static 'css/ponytracker.css' %}" rel="stylesheet">
{% block css %}{% endblock %} {% block css %}{% endblock %}
<script src="{% bootstrap_jquery_url %}"></script>
{% bootstrap_javascript %}
{% block js %}{% endblock %} {% block js %}{% endblock %}
{% block media %}{% endblock %}
</head> </head>
<body> <body>
@ -62,6 +58,8 @@
</div> <!-- /container --> </div> <!-- /container -->
<script src="{% bootstrap_jquery_url %}"></script>
{% bootstrap_javascript %}
<script src="{% static 'js/ponytracker.js' %}"></script> <script src="{% static 'js/ponytracker.js' %}"></script>
{% block js_end %}{% endblock %} {% block js_end %}{% endblock %}
</body> </body>

5
templates/tracker/issue_details.html
View file

@ -5,8 +5,8 @@
{% load tracker_filters %} {% load tracker_filters %}
{% load staticfiles %} {% load staticfiles %}
{% block media %} {% block css %}
{{ form.media }} {{ form.media.css }}
{% endblock %} {% endblock %}
{% block tabcontent %} {% block tabcontent %}
@ -227,4 +227,5 @@ var markdown_preview_url = "{% url 'markdown' %}";
</script> </script>
<script src="{% static 'js/jquery.cookie.js' %}"></script> <script src="{% static 'js/jquery.cookie.js' %}"></script>
<script src="{% static 'js/markdown-preview.js' %}"></script> <script src="{% static 'js/markdown-preview.js' %}"></script>
{{ form.media.js }}
{% endblock %} {% endblock %}

19
templates/tracker/milestone_edit.html
View file

@ -4,6 +4,11 @@
{% block milestonetab %} class="active"{% endblock %} {% block milestonetab %} class="active"{% endblock %}
{% block css %}
{{ block.super }}
{{ form.media.css }}
{% endblock %}
{% block moretabs %} {% block moretabs %}
<div class="pull-right"> <div class="pull-right">
<div class="btn-group"> <div class="btn-group">
@ -17,10 +22,6 @@
</div> </div>
{% endblock %} {% endblock %}
{% block media %}
{{ form.media }}
{% endblock %}
{% block tabcontent %} {% block tabcontent %}
<div class="row"> <div class="row">
@ -49,3 +50,13 @@
</div> </div>
{% endblock %} {% endblock %}
{% block js_end %}
{{ block.super }}
{{ form.media.js }}
<script>
$(function() {
$("#id_due_date_picker").datetimepicker({"format": "YYYY-MM-DD HH:mm", "language": "en-us"});
});
</script>
{% endblock %}

2
tracker/forms.py
View file

@ -40,5 +40,5 @@ class MilestoneForm(forms.ModelForm):
model = Milestone model = Milestone
fields = ['name', 'due_date'] fields = ['name', 'due_date']
widgets = { widgets = {
'due_date': DateTimePicker(format="%Y-%m-%d %H:%M"), 'due_date': DateTimePicker(options=False),
} }