Skip to content

Commit

Permalink
Adapted to using django.contrib.staticfiles instead of the
Browse files Browse the repository at this point in the history
MEDIA_ROOT and management commands to gather the staticfiles.
This removes backwards compatibility with earlier versions of django
  • Loading branch information
carsongee committed Nov 30, 2013
1 parent 073f2ee commit dc1c58f
Show file tree
Hide file tree
Showing 308 changed files with 78 additions and 162 deletions.
Empty file.
Empty file.
35 changes: 0 additions & 35 deletions formunculous/management/commands/func_media_copy.py

This file was deleted.

49 changes: 0 additions & 49 deletions formunculous/management/commands/func_media_symlink.py

This file was deleted.

File renamed without changes
File renamed without changes.
File renamed without changes.
18 changes: 9 additions & 9 deletions formunculous/templates/formunculous/apply.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{% extends "formunculous/base.html" %}

{% load i18n widget_type formunculous_tags %}
{% load i18n widget_type formunculous_tags static %}
{% get_current_language as LANGUAGE_CODE %}
{% block css %}
{{ block.super }}
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="{% static 'formunculous/js/jquery' %}-1.3.2.min.js"></script>
{{ form.media }}
<link href="{{ MEDIA_URL }}formunculous/css/formunculous.css" rel="stylesheet" type="text/css" />
<link href="{{ MEDIA_URL }}formunculous/css/apply.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/jquery.formset.js"></script>
{% ifnotequal LANGUAGE_CODE "en" %}{% ifnotequal LANGUAGE_CODE "en-us" %}<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/jquery.ui.datepicker-{{ LANGUAGE_CODE }}.js"></script>{% endifnotequal %}{% endifnotequal %}
<link href="{% static 'formunculous/css/formunculous.css' %}" rel="stylesheet" type="text/css" />
<link href="{% static 'formunculous/css/apply.css' %}" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="{% static 'formunculous/js/jquery.formset.js' %}"></script>
{% ifnotequal LANGUAGE_CODE "en" %}{% ifnotequal LANGUAGE_CODE "en-us" %}<script type="text/javascript" src="{% static 'formunculous/js/jquery.ui.datepicker' %}-{{ LANGUAGE_CODE }}.js"></script>{% endifnotequal %}{% endifnotequal %}
{% if subforms %}
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/apply_sub_form.js"></script>
<script type="text/javascript" src="{% static 'formunculous/js/apply' %}_sub_form.js"></script>

<script type="text/javascript">
jQuery(function($) {
Expand All @@ -33,8 +33,8 @@

{% if history %}
{% if not ad.email_only %}
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/csrf.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/history.js"></script>
<script type="text/javascript" src="{% static 'formunculous/js/csrf.js' %}"></script>
<script type="text/javascript" src="{% static 'formunculous/js/history.js' %}"></script>
<script type="text/javascript">
var historyURL = '{% url 'formunculous-apply-history' %}'
</script>
Expand Down
2 changes: 1 addition & 1 deletion formunculous/templates/formunculous/base.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{% extends "base.html" %}
{% extends "base.html" %}
12 changes: 6 additions & 6 deletions formunculous/templates/formunculous/builder_ad_form.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{% extends "formunculous/builder_base.html" %}

{% load i18n widget_type adminmedia %}
{% load i18n widget_type adminmedia static %}


{% block extrastyle %}{{ block.super }}
{{ form.media }}
{{ media }}
<link href="{{ MEDIA_URL }}formunculous/css/formunculous.css" rel="stylesheet" type="text/css" />
<link href="{{ MEDIA_URL }}formunculous/css/apply.css" rel="stylesheet" type="text/css" />
<link href="{% static 'formunculous/css/formunculous.css' %}" rel="stylesheet" type="text/css" />
<link href="{% static 'formunculous/css/apply.css' %}" rel="stylesheet" type="text/css" />
<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/widgets.css" />
{% endblock %}

{% block extrahead %}{{ block.super }}
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/urlify.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/ckeditor/ckeditor.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/toggle_ck.js"></script>
<script type="text/javascript" src="{% static 'formunculous/js/urlify.js' %}"></script>
<script type="text/javascript" src="{% static 'formunculous/js/ckeditor/ckeditor.js' %}"></script>
<script type="text/javascript" src="{% static 'formunculous/js/toggle' %}_ck.js"></script>
{% endblock %}
{% block title %}{% if add %}{% trans "New Form Definition" %}{% else %}{% trans "Modifying" %}{{ ad.name }}{% endif %}{% endblock %}

Expand Down
6 changes: 3 additions & 3 deletions formunculous/templates/formunculous/builder_dropdown.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% load i18n %}
{% load i18n static %}
<html>
<head>
{% block extrastyle %}{{ block.super }}
{{ form.media }}
<link href="{{ MEDIA_URL }}formunculous/css/formunculous.css" rel="stylesheet" type="text/css" />
<link href="{{ MEDIA_URL }}formunculous/css/apply.css" rel="stylesheet" type="text/css" />
<link href="{% static 'formunculous/css/formunculous.css' %}" rel="stylesheet" type="text/css" />
<link href="{% static 'formunculous/css/apply.css' %}" rel="stylesheet" type="text/css" />
<style type="text/css">
html {
font-family: Arial, Helvetica, sans-serif;
Expand Down
24 changes: 12 additions & 12 deletions formunculous/templates/formunculous/builder_edit_fields.html
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{% extends "formunculous/builder_base.html" %}
{% load i18n %}
{% load i18n static %}

{% block extrastyle %}{{ block.super }}
<link href="{{ MEDIA_URL }}formunculous/css/formunculous.css" rel="stylesheet" type="text/css" />
<link href="{{ MEDIA_URL }}formunculous/css/apply.css" rel="stylesheet" type="text/css" />
<link href="{{ MEDIA_URL }}formunculous/css/smoothness/jquery-ui-1.7.2.custom.css" rel="stylesheet" type="text/css">
<link href="{% static 'formunculous/css/formunculous.css' %}" rel="stylesheet" type="text/css" />
<link href="{% static 'formunculous/css/apply.css' %}" rel="stylesheet" type="text/css" />
<link href="{% static 'formunculous/css/smoothness/jquery' %}-ui-1.7.2.custom.css" rel="stylesheet" type="text/css">

{{ forms.media }}
{% endblock %}

{% block extrahead %}{{ block.super }}
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/jquery-ui-1.7.2.custom.min.js"></script>
<script type="text/javascript" src="{% static 'formunculous/js/jquery' %}-1.3.2.min.js"></script>
<script type="text/javascript" src="{% static 'formunculous/js/jquery' %}-ui-1.7.2.custom.min.js"></script>

<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/csrf.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/urlify.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/ckeditor/ckeditor.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/toggle_ck.js"></script>
<script type="text/javascript" src="{% static 'formunculous/js/csrf.js' %}"></script>
<script type="text/javascript" src="{% static 'formunculous/js/urlify.js' %}"></script>
<script type="text/javascript" src="{% static 'formunculous/js/ckeditor/ckeditor.js' %}"></script>
<script type="text/javascript" src="{% static 'formunculous/js/toggle' %}_ck.js"></script>
{% if is_parent %}
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/subform.js"></script>
<script type="text/javascript" src="{% static 'formunculous/js/subform.js' %}"></script>
{% endif %}

<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/field_edit.js"></script>
<script type="text/javascript" src="{% static 'formunculous/js/field' %}_edit.js"></script>

<script type="text/javascript">

Expand Down
16 changes: 8 additions & 8 deletions formunculous/templates/formunculous/builder_index.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{% extends "formunculous/builder_base.html" %}
{% load i18n %}
{% load i18n static %}

{% block extrastyle %}{{ block.super }}
<link href="{{ MEDIA_URL }}formunculous/css/smoothness/jquery-ui-1.7.2.custom.css" rel="stylesheet" type="text/css">
<link href="{{ MEDIA_URL }}formunculous/css/formunculous.css" rel="stylesheet" type="text/css" />
<link href="{{ MEDIA_URL }}formunculous/css/apply.css" rel="stylesheet" type="text/css" />
<link href="{% static 'formunculous/css/smoothness/jquery-ui-1.7.2.custom.css' %}" rel="stylesheet" type="text/css">
<link href="{% static 'formunculous/css/formunculous.css' %}" rel="stylesheet" type="text/css" />
<link href="{% static 'formunculous/css/apply.css' %}" rel="stylesheet" type="text/css" />
{% endblock %}

{% block extrahead %}{{ block.super }}
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/jquery-ui-1.7.2.custom.min.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/csrf.js"></script>
<script type="text/javascript" src="{% static 'formunculous/js/jquery' %}-1.3.2.min.js"></script>
<script type="text/javascript" src="{% static 'formunculous/js/jquery' %}-ui-1.7.2.custom.min.js"></script>
<script type="text/javascript" src="{% static 'formunculous/js/csrf.js' %}"></script>
<script type="text/javascript">
var current_app_id = 0;
var current_app_slug = '';
Expand Down Expand Up @@ -144,7 +144,7 @@
}

</script>
<script type="text/javascript" src="{{ MEDIA_URL }}formunculous/js/urlify.js"></script>
<script type="text/javascript" src="{% static 'formunculous/js/urlify.js' %}"></script>
{% endblock %}

{% block title %}
Expand Down
Loading

0 comments on commit dc1c58f

Please sign in to comment.