Skip to content

Commit

Permalink
Load admin/js/vendor/jquery
Browse files Browse the repository at this point in the history
this commit loads the jquery version from the admin so that the
changes in e314ffe can possibly work. It also cleans up a bit
the admin templates.

NOTE: the {{ media }} tag will load js/css from admin forms
defined inside Django and some of these are also manually loaded
in admin/base_site.html and tcms_base.html as well. IMO this is
a mess and should be cleaned up during the patternfly migration!
  • Loading branch information
atodorov committed Sep 19, 2017
1 parent c87edd5 commit eb5c422
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
3 changes: 0 additions & 3 deletions tcms/templates/admin/auth/user/change_password.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
{% block custom_stylesheet %}
{% endblock %}

{% block extrahead %}{{ block.super }}
<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
{% endblock %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static 'admin/css/forms.css' %}" />{% endblock %}
{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}
{% block breadcrumbs %}{% if not is_popup %}
Expand Down
3 changes: 1 addition & 2 deletions tcms/templates/admin/change_form.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{% extends "admin/base_site.html" %}
{% load i18n admin_modify %}
{% block extrahead %}{{ block.super }}
<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
{% block custom_javascript %}{{ block.super }}
{{ media }}
{% endblock %}

Expand Down
4 changes: 3 additions & 1 deletion tcms/templates/tcms_base.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<link rel="stylesheet" type="text/css" href="{% static 'style/base.css' %}" media="screen" />
<link rel="stylesheet" type="text/css" href="{% static 'style/print.css' %}" media="print" />
{% block custom_stylesheet %}{% endblock %}
<script type="text/javascript" src="{% static 'admin/js/vendor/jquery/jquery.min.js' %}"></script>
<script type="text/javascript" src="{% static 'admin/js/jquery.init.js' %}"></script>

<script type="text/javascript" src="{% static 'js/lib/jquery-1.7.2.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/lib/jquery-ui-1.8.20.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/lib/handlebars-1.3.0.min.js' %}"></script>
Expand All @@ -35,7 +38,6 @@
</script>
<script type="text/javascript" src="{% static 'js/lib/jquery.shiftcheckbox.js' %}"></script>
<script type="text/javascript" src="{% static 'js/tcms_actions.js' %}"></script>
<script type="text/javascript" src="{% static 'admin/js/jquery.init.js' %}"></script>

{% block custom_javascript %}{% endblock %}
{% if SETTINGS.ENABLE_PIWIK_TRACKING %}
Expand Down

0 comments on commit eb5c422

Please sign in to comment.