diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 18:01:59 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 18:01:59 -0500 |
| commit | 764182c0ca66b538cef994409f04f876681598cd (patch) | |
| tree | 2f399c618484c00f84875b437f3fcfcc9c509424 /templates/packages | |
| parent | 8844fd0c6361d3a6ccd88647276e9af0e6cd64d2 (diff) | |
| parent | 822898e57bc6d4e008ef58da309857e9ef8c98e6 (diff) | |
Merge commit '822898e' (Merge branch 'django14')
Conflicts:
requirements.txt
requirements_prod.txt
templates/base.html
templates/devel/clock.html
templates/public/download.html
templates/public/index.html
templates/releng/results.html
Diffstat (limited to 'templates/packages')
| -rw-r--r-- | templates/packages/search.html | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/templates/packages/search.html b/templates/packages/search.html index e4de5bb6..b344af1f 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -1,13 +1,13 @@ {% extends "base.html" %} {% load package_extras %} -{% load adminmedia %} +{% load admin_static %} {% block title %}Parabola - Package Database{% endblock %} {% block navbarclass %}anb-packages{% endblock %} {% block head %} {% if is_paginated and page_obj.number > 1 %}<meta name="robots" content="noindex, nofollow"/>{% endif %} -<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/widgets.css" /> +<link rel="stylesheet" type="text/css" href="{% static "admin/css/widgets.css" %}" /> {% endblock %} {% block content %} @@ -123,8 +123,12 @@ href="https://repo.parabolagnulinux.org/sources/packages" title="Sourceballed packages">sources repo</a>.</p> </div> +{% load cdn %}{% jquery %} <script type="text/javascript" src="/jsi18n/"></script> -<script type="text/javascript">window.__admin_media_prefix__ = "{% filter escapejs %}{% admin_media_prefix %}{% endfilter %}";</script> -<script type="text/javascript" src="{% admin_media_prefix %}js/core.js"></script> +<script type="text/javascript"> + window.__admin_media_prefix__ = "{% filter escapejs %}{% static "admin/" %}{% endfilter %}"; + var django = {"jQuery": jQuery}; +</script> +<script type="text/javascript" src="{% static "admin/js/core.js" %}"></script> {{search_form.media}} {% endblock %} |