Upgrade site requirements to latest everything

This commit is contained in:
Patrick Altman
2013-07-04 19:26:24 -05:00
parent 13055afd83
commit d0323f2401
8 changed files with 16 additions and 48 deletions

View File

@@ -60,7 +60,7 @@ STATICFILES_FINDERS = [
"django.contrib.staticfiles.finders.FileSystemFinder", "django.contrib.staticfiles.finders.FileSystemFinder",
"django.contrib.staticfiles.finders.AppDirectoriesFinder", "django.contrib.staticfiles.finders.AppDirectoriesFinder",
] ]
SECRET_KEY = os.environ.get("SECRET_KEY", "") SECRET_KEY = os.environ.get("SECRET_KEY", "change-me")
TEMPLATE_LOADERS = [ TEMPLATE_LOADERS = [
"django.template.loaders.filesystem.Loader", "django.template.loaders.filesystem.Loader",
"django.template.loaders.app_directories.Loader", "django.template.loaders.app_directories.Loader",
@@ -74,7 +74,7 @@ TEMPLATE_CONTEXT_PROCESSORS = [
"django.core.context_processors.tz", "django.core.context_processors.tz",
"django.core.context_processors.request", "django.core.context_processors.request",
"django.contrib.messages.context_processors.messages", "django.contrib.messages.context_processors.messages",
"pinax_utils.context_processors.settings", "pinax_theme_bootstrap.context_processors.theme",
"account.context_processors.account", "account.context_processors.account",
] ]
MIDDLEWARE_CLASSES = [ MIDDLEWARE_CLASSES = [
@@ -99,7 +99,6 @@ INSTALLED_APPS = [
"django.contrib.staticfiles", "django.contrib.staticfiles",
# theme # theme
"pinax_theme_bootstrap_account",
"pinax_theme_bootstrap", "pinax_theme_bootstrap",
"django_forms_bootstrap", "django_forms_bootstrap",

View File

@@ -1,3 +1,3 @@
<div class="well" id="done-count" data-refresh-url="{% url task_complete_count_fragment %}"> <div class="well" id="done-count" data-refresh-url="{% url "task_complete_count_fragment" %}">
<h2>{{ done_count }} task{{ done_count|pluralize }} completed</h2> <h2>{{ done_count }} task{{ done_count|pluralize }} completed</h2>
</div> </div>

View File

@@ -3,11 +3,11 @@
<div class="btn-toolbar"> <div class="btn-toolbar">
<div class="btn-group"> <div class="btn-group">
{% if task.done %} {% if task.done %}
<a href="{% url task_mark_undone task.pk %}" class="btn ajax" data-method="post" data-refresh="#done-count" data-replace-closest="tr"><i class="icon-remove"></i></a> <a href="{% url "task_mark_undone" task.pk %}" class="btn ajax" data-method="post" data-refresh="#done-count" data-replace-closest="tr"><i class="icon-remove"></i></a>
{% else %} {% else %}
<a href="{% url task_mark_done task.pk %}" class="btn ajax" data-method="post" data-refresh="#done-count" data-replace-closest="tr"><i class="icon-ok"></i></a> <a href="{% url "task_mark_done" task.pk %}" class="btn ajax" data-method="post" data-refresh="#done-count" data-replace-closest="tr"><i class="icon-ok"></i></a>
{% endif %} {% endif %}
<a href="{% url task_delete task.pk %}" class="btn ajax" data-method="post" data-replace-inner="#message" data-remove-closest="tr" data-refresh="#done-count"><i class="icon-trash"></i></a> <a href="{% url "task_delete" task.pk %}" class="btn ajax" data-method="post" data-replace-inner="#message" data-remove-closest="tr" data-refresh="#done-count"><i class="icon-trash"></i></a>
</div> </div>
</div> </div>
</td> </td>

View File

@@ -19,7 +19,7 @@
bootstrap-ajax bootstrap-ajax
</a> </a>
</p> </p>
<form class="form-inline ajax" method="post" action="{% url task_add %}" data-append="#tasks"> <form class="form-inline ajax" method="post" action="{% url "task_add" %}" data-append="#tasks">
{% csrf_token %} {% csrf_token %}
<div class="input-append"> <div class="input-append">
<input type="text" class="span4" name="label" placeholder="Enter a task..."> <input type="text" class="span4" name="label" placeholder="Enter a task...">

View File

@@ -1,7 +1,6 @@
{% extends "theme_base.html" %} {% extends "theme_base.html" %}
{% load metron_tags %} {% load metron_tags %}
{% load i18n %}
{% block extra_head_base %} {% block extra_head_base %}
<style type="text/css"> <style type="text/css">

View File

@@ -1,28 +1,6 @@
"""
WSGI config for demo project.
This module contains the WSGI application used by Django's development server
and any production WSGI deployments. It should expose a module-level variable
named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
this application via the ``WSGI_APPLICATION`` setting.
Usually you will have the standard Django WSGI application here, but it also
might make sense to replace the whole Django WSGI application with a custom one
that later delegates to the Django one. For example, you could introduce WSGI
middleware here, or combine a Django application with an application of another
framework.
"""
import os import os
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo.settings")
# This application object is used by any WSGI server configured to use this
# file. This includes Django's development server, if the WSGI_APPLICATION
# setting points here.
from django.core.wsgi import get_wsgi_application from django.core.wsgi import get_wsgi_application
application = get_wsgi_application() application = get_wsgi_application()
# Apply WSGI middleware here.
# from helloworld.wsgi import HelloWorldApplication
# application = HelloWorldApplication(application)

View File

@@ -1,9 +1,8 @@
#!/usr/bin/env python #!/usr/bin/env python
import os, sys import os
import sys
if __name__ == "__main__": if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo.settings")
from django.core.management import execute_from_command_line from django.core.management import execute_from_command_line
execute_from_command_line(sys.argv) execute_from_command_line(sys.argv)

View File

@@ -1,14 +1,7 @@
--extra-index-url=http://dist.pinaxproject.com/dev/ Django==1.5.1
--extra-index-url=http://dist.pinaxproject.com/alpha/ pinax-theme-bootstrap==3.0a11
django-user-accounts==1.0b14
Django==1.4.2 metron==1.1
pinax-theme-bootstrap==2.2.0 gondor==1.2.4
pinax-theme-bootstrap-account==1.0b2 psycopg2==2.5.1
django-user-accounts==1.0b3 gunicorn==17.5
django-forms-bootstrap==2.0.3.post1
metron==1.0
pinax-utils==1.0b1.dev3
gondor==1.1.5
psycopg2==2.4.5
gunicorn==0.14.5