Permalink
Browse files

Changes from local testing.

Behavior of _ has changed.

Add STATIC_URL setting.

This will need to be coordinated with an Apache config change to serve
admin assets from /static/admin/.
  • Loading branch information...
1 parent ca6666e commit 49d06f4f2124f67f0d7f4b656a9fcadf9fb26160 James Socol committed with groovecoder Mar 27, 2013
@@ -138,7 +138,7 @@ <h1 class="mod-title">{{_('Update Your Profile')}}</h1>
<p class="note">{{_('JPEG and PNG supported. Minimum size of 480x360.')}}</p>
</li>
{{ li_field(form, 'video_url', note=_('We support YouTube and Vimeo')) }}
- {{ li_field(form, 'navbar_optout', note=_('If your demo has problems when displayed in an <iframe>, try changing this.')) }}
+ {{ li_field(form, 'navbar_optout', note=_('If your demo has problems when displayed in an &lt;iframe&gt;, try changing this.')) }}
</ul>
</fieldset>
@@ -17,6 +17,7 @@
{{ errorlist(document_form) }}
{{ errorlist(revision_form) }}
<form id="wiki-page-edit" class="editing" method="post" action="">
+ {{ csrf() }}
<fieldset>
<header id="article-head">
{{ document_form.category|safe }}
View
@@ -340,7 +340,7 @@ def document(request, document_slug, document_locale):
# We can throw a 404 immediately if the request type is HEAD
if request.method == 'HEAD':
- raise Http404
+ raise Http404()
try:
# Look in default language:
@@ -369,7 +369,7 @@ def document(request, document_slug, document_locale):
request.GET.get('include', False) is not False or
request.GET.get('nocreate', False) is not False or
not request.user.is_authenticated()):
- raise Http404
+ raise Http404()
# The user may be trying to create a child page; if a parent exists
# for this document, redirect them to the "Create" page
View
@@ -778,7 +778,7 @@
$("<input type='hidden' name='title' />").val(title).appendTo($form);
// Add the CSRF ?
- $('#csrfmiddlewaretoken').clone().appendTo($form);
+ $('input[name=csrfmiddlewaretoken]').clone().appendTo($form);
// Submit the form, and then get rid of it
$form.get(0).submit();
View
@@ -291,6 +291,7 @@ def lazy_language_deki_map():
# trailing slash if there is a path component (optional in other cases).
# Examples: "http://media.lawrence.com", "http://example.com/media/"
MEDIA_URL = '/media/'
+STATIC_URL = '/static/'
SERVE_MEDIA = False
@@ -387,7 +388,7 @@ def lazy_language_deki_map():
ACCOUNT_ACTIVATION_DAYS = 30
MAX_AVATAR_FILE_SIZE = 131072 # 100k, in bytes
-ROOT_URLCONF = '%s.urls' % ROOT_PACKAGE
+ROOT_URLCONF = 'urls'
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates"

0 comments on commit 49d06f4

Please sign in to comment.