Skip to content

Use static templatetag rather than STATIC_URL #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
evansd wants to merge 1 commit into from
Closed

Use static templatetag rather than STATIC_URL #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions feincms/admin/tree_editor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import json
import logging

from django.conf import settings as django_settings
from django.contrib import admin
from django.contrib.admin.views import main
from django.contrib.staticfiles.templatetags.staticfiles import static
from django.db.models import Q
from django.http import (HttpResponse, HttpResponseBadRequest,
HttpResponseForbidden, HttpResponseNotFound, HttpResponseServerError)
Expand Down Expand Up @@ -35,8 +35,9 @@ def django_boolean_icon(field_val, alt_text=None, title=None):
title = 'title="%s" ' % title
else:
title = ''
return mark_safe(u'<img src="%sfeincms/img/icon-%s.gif" alt="%s" %s/>' %
(django_settings.STATIC_URL, BOOLEAN_MAPPING[field_val], alt_text, title))
icon_url = static('feincms/img/icon-%s.gif' % BOOLEAN_MAPPING[field_val])
return mark_safe(u'<img src="%s" alt="%s" %s/>' %
(icon_url, alt_text, title))


def _build_tree_structure(cls):
Expand Down
9 changes: 5 additions & 4 deletions feincms/module/page/modeladmins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from django.conf import settings as django_settings
from django.core.exceptions import PermissionDenied
from django.contrib.contenttypes.models import ContentType
from django.contrib.staticfiles.templatetags.staticfiles import static
from django.contrib import admin
from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect
Expand Down Expand Up @@ -101,10 +102,10 @@ def _actions_column(self, page):
page.id)
actions = super(PageAdmin, self)._actions_column(page)
if editable:
actions.insert(0, u'<a href="add/?parent=%s" title="%s"><img src="%sfeincms/img/icon_addlink.gif" alt="%s"></a>' % (
page.pk, _('Add child page'), django_settings.STATIC_URL, _('Add child page')))
actions.insert(0, u'<a href="%s" title="%s"><img src="%sfeincms/img/selector-search.gif" alt="%s" /></a>' % (
preview_url, _('View on site'), django_settings.STATIC_URL, _('View on site')))
actions.insert(0, u'<a href="add/?parent=%s" title="%s"><img src="%s" alt="%s"></a>' % (
page.pk, _('Add child page'), static('feincms/img/icon_addlink.gif'), _('Add child page')))
actions.insert(0, u'<a href="%s" title="%s"><img src="%s" alt="%s" /></a>' % (
preview_url, _('View on site'), static('feincms/img/selector-search.gif'), _('View on site')))

return actions

Expand Down
4 changes: 2 additions & 2 deletions feincms/templates/admin/content/table/init.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load i18n %}
<script type="text/javascript" src="{{ STATIC_URL }}feincms/jquery.json-2.4.min.js"></script>
{% load i18n staticfiles %}
<script type="text/javascript" src="{% static 'feincms/jquery.json-2.4.min.js' %}"></script>
<script type="text/javascript">
//<![CDATA[

Expand Down
3 changes: 2 additions & 1 deletion feincms/templates/admin/feincms/_regions_js.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% load staticfiles %}
<script type="text/javascript" charset="utf-8">
IMG_DELETELINK_PATH = "{{ STATIC_URL }}feincms/img/icon_deletelink.gif";
IMG_DELETELINK_PATH = "{% static 'feincms/img/icon_deletelink.gif' %}";

REGION_MAP = [{% for region in original.template.regions %}'{{ region.key }}'{% if not forloop.last %}, {% endif %}{% endfor %}];
REGION_NAMES = [{% for region in original.template.regions %}'{{ region.title|capfirst }}'{% if not forloop.last %}, {% endif %}{% endfor %}];
Expand Down
10 changes: 5 additions & 5 deletions feincms/templates/admin/feincms/fe_editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{% extends "admin/change_form.html" %}
{% load i18n admin_modify %}
{% load i18n admin_modify staticfiles %}


{% block extrahead %}{{ block.super }}
<script type="text/javascript" src="{{ STATIC_URL }}feincms/jquery-1.8.3.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}feincms/jquery-ui-1.8.22.custom.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}feincms/jquery.alerts.js"></script>
<script type="text/javascript" src="{% static 'feincms/jquery-1.8.3.min.js' %}"></script>
<script type="text/javascript" src="{% static 'feincms/jquery-ui-1.8.22.custom.min.js' %}"></script>
<script type="text/javascript" src="{% static 'feincms/jquery.alerts.js' %}"></script>
<script type="text/javascript">
var feincms = {
{% if FEINCMS_JQUERY_NO_CONFLICT %}
Expand All @@ -15,7 +15,7 @@
{% endif %}
};
</script>
<script type="text/javascript" src="{{ STATIC_URL }}feincms/item_editor.js"></script>
<script type="text/javascript" src="{% static 'feincms/item_editor.js' %}"></script>

{% include "admin/feincms/_messages_js.html" %}
{% include "admin/feincms/_regions_js.html" %}
Expand Down
5 changes: 3 additions & 2 deletions feincms/templates/admin/feincms/fe_editor_done.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<script type="text/javascript" src="{{ STATIC_URL }}feincms/jquery-1.8.3.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}feincms/jquery-ui-1.8.22.custom.min.js"></script>
{% load staticfiles %}
<script type="text/javascript" src="{% static 'feincms/jquery-1.8.3.min.js' %}"></script>
<script type="text/javascript" src="{% static 'feincms/jquery-ui-1.8.22.custom.min.js' %}"></script>
<script type="text/javascript">
var feincms = {
{% if FEINCMS_JQUERY_NO_CONFLICT %}
Expand Down
8 changes: 4 additions & 4 deletions feincms/templates/admin/feincms/fe_tools.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{% load i18n %}
{% load i18n staticfiles %}
{% load url from future %}

<script type="text/javascript" charset="utf-8">
(function () {
// load jQuery if not yet present
if (typeof(feincms) == "undefined") {
var jquery_url = "{{ STATIC_URL }}feincms/jquery-1.8.3.min.js";
var jquery_url = "{% static 'feincms/jquery-1.8.3.min.js' %}";
document.write(unescape('%3Cscript src="' + jquery_url + '" type="text/javascript"%3E%3C/script%3E'));
}
})();
Expand All @@ -21,8 +21,8 @@
};
</script>

<script src="{{ STATIC_URL }}feincms//frontend_editing.js" type="text/javascript" charset="utf-8"></script>
<link rel="stylesheet" href="{{ STATIC_URL }}feincms//frontend_editing.css" type="text/css" media="screen" charset="utf-8">
<script src="{% static 'feincms//frontend_editing.js' %}" type="text/javascript" charset="utf-8"></script>
<link rel="stylesheet" href="{% static 'feincms//frontend_editing.css' %}" type="text/css" media="screen" charset="utf-8">

<div id="fe_controls">
<a href="?frontend_editing=0">{% trans "Stop Editing" %}</a>
Expand Down
12 changes: 6 additions & 6 deletions feincms/templates/admin/feincms/item_editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{% extends "admin/change_form.html" %}
{% load i18n admin_modify %}
{% load i18n admin_modify staticfiles %}

{% block extrahead %}{{ block.super }}
{% block feincms_jquery_ui %}
<script type="text/javascript" src="{{ STATIC_URL }}feincms/jquery-1.8.3.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}feincms/jquery-ui-1.8.22.custom.min.js"></script>
<script type="text/javascript" src="{% static 'feincms/jquery-1.8.3.min.js' %}"></script>
<script type="text/javascript" src="{% static 'feincms/jquery-ui-1.8.22.custom.min.js' %}"></script>
{% endblock %}

<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}feincms/style.css" />
<script type="text/javascript" src="{{ STATIC_URL }}feincms/jquery.alerts.js"></script>
<link rel="stylesheet" type="text/css" href="{% static 'feincms/style.css' %}" />
<script type="text/javascript" src="{% static 'feincms/jquery.alerts.js' %}"></script>
<script type="text/javascript">
var feincms = {
{% if FEINCMS_JQUERY_NO_CONFLICT %}
Expand All @@ -18,7 +18,7 @@
{% endif %}
};
</script>
<script type="text/javascript" src="{{ STATIC_URL }}feincms/item_editor.js"></script>
<script type="text/javascript" src="{% static 'feincms/item_editor.js' %}"></script>

{% include "admin/feincms/_messages_js.html" %}
{% include "admin/feincms/_regions_js.html" %}
Expand Down
18 changes: 9 additions & 9 deletions feincms/templates/admin/feincms/tree_editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% extends "admin/change_list.html" %}
{% load admin_list i18n %}
{% load admin_list i18n staticfiles %}

{% block extrahead %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}feincms/style.css" />
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}feincms/fein_tree.css" />
<link rel="stylesheet" type="text/css" href="{% static 'feincms/style.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'feincms/fein_tree.css' %}" />

<script type="text/javascript" src="{{ STATIC_URL }}feincms/jquery-1.8.3.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}feincms/jquery-ui-1.8.22.custom.min.js"></script>
<script type="text/javascript" src="{% static 'feincms/jquery-1.8.3.min.js' %}"></script>
<script type="text/javascript" src="{% static 'feincms/jquery-ui-1.8.22.custom.min.js' %}"></script>
<script type="text/javascript">
var feincms = {
{% if FEINCMS_JQUERY_NO_CONFLICT %}
Expand All @@ -18,10 +18,10 @@
, "tree_structure": {{ tree_structure|default:"null" }}
};
</script>
<script type="text/javascript" src="{{ STATIC_URL }}feincms/ie_compat.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}feincms/jquery.cookie.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}feincms/toolbox.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}feincms/fein_tree.js"></script>
<script type="text/javascript" src="{% static 'feincms/ie_compat.js' %}"></script>
<script type="text/javascript" src="{% static 'feincms/jquery.cookie.js' %}"></script>
<script type="text/javascript" src="{% static 'feincms/toolbox.js' %}"></script>
<script type="text/javascript" src="{% static 'feincms/fein_tree.js' %}"></script>

{% endblock %}

Expand Down