Closes #2

ktonon · Aug 20, 2011 · 9cde56f · 9cde56f
1 parent 7e00698
commit 9cde56f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/mingus/requirements.txt b/mingus/requirements.txt
@@ -1,7 +1,7 @@
 BeautifulSoup==3.2.0
 PIL
 python-dateutil==1.4.1
-django==1.1.1
+django==1.3.0
 django-debug-toolbar==0.8.1
 django-tagging==0.3
 Pygments==1.1.1

diff --git a/mingus/settings.py b/mingus/settings.py
@@ -7,12 +7,15 @@
 ADMIN_MEDIA_PREFIX = '/admin_media/'
 
 #staticfiles app values
-STATIC_URL = '/media/mingus/'
-STATIC_ROOT = os.path.join(PROJECT_ROOT, 'static')
+STATIC_URL = '/static/'
+STATIC_ROOT = os.path.join(PROJECT_ROOT, 'static', 'mingus')
 STATICFILES_DIRS = (
     os.path.join(PROJECT_ROOT, 'media', 'mingus'),
 )
 
+# Login paths
+LOGIN_REDIRECT_URL = '/admin/'
+
 SITE_ID = 1
 ROOT_URLCONF = 'mingus.urls'
 TIME_ZONE = 'America/New_York'

diff --git a/mingus/stable-requirements.txt b/mingus/stable-requirements.txt
@@ -1,7 +1,7 @@
 BeautifulSoup==3.2.0
 PIL
 python-dateutil==1.4.1
-django==1.1.1
+django==1.3.0
 django-debug-toolbar==0.8.1
 django-tagging==0.3
 Pygments==1.1.1

diff --git a/mingus/templates/admin/login.html b/mingus/templates/admin/login.html
@@ -14,7 +14,7 @@
 <p class="errornote">{{ error_message }}</p>
 {% endif %}
 <div id="content-main">
-<form action="{{ app_path }}" method="post" id="login-form">
+<form action="{{ app_path }}" method="post" id="login-form">{% csrf_token %}
   <div class="form-row">
     <label for="id_username">{% trans 'Username:' %}</label> <input type="text" name="username" id="id_username" />
   </div>