Commit cc556c20 authored by Janez K's avatar Janez K
Browse files

dodal appe iz django 1.3 projekta

parent cba8deeb
...@@ -129,6 +129,12 @@ INSTALLED_APPS = ( ...@@ -129,6 +129,12 @@ INSTALLED_APPS = (
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'django.contrib.admin', 'django.contrib.admin',
'south',
'workflows',
'website',
'signuplogin',
'django_extensions',
'django.contrib.humanize',
) )
# A sample logging configuration. The only tangible logging # A sample logging configuration. The only tangible logging
...@@ -160,7 +166,6 @@ LOGGING = { ...@@ -160,7 +166,6 @@ LOGGING = {
} }
} }
TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS
try: try:
LOCAL_SETTINGS LOCAL_SETTINGS
...@@ -169,3 +174,18 @@ except NameError: ...@@ -169,3 +174,18 @@ except NameError:
from local_settings import * from local_settings import *
except ImportError: except ImportError:
pass pass
TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS
TEMPLATES_FOLDER = os.path.join(PROJECT_DIR, 'templates')
PROJECT_FOLDER = PROJECT_DIR
TEMPLATE_DIRS = (TEMPLATES_FOLDER,)
AUTH_PROFILE_MODULE = 'workflows.UserProfile'
LOGIN_URL = '/login/'
LOGIN_REDIRECT_URL = '/'
STATIC_DOC_ROOT = os.path.join(os.getcwd(), 'media')
from django.conf.urls import patterns, include, url from django.conf.urls.defaults import patterns, include, url
from django.contrib import admin from mothra.settings import LOGIN_URL
from mothra.settings import DEBUG, STATIC_DOC_ROOT
# Uncomment the next two lines to enable the admin:
from django.contrib import admin
admin.autodiscover() admin.autodiscover()
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^admin/', include(admin.site.urls)), # Examples:
# url(r'^$', 'mothra.views.home', name='home'),
# url(r'^mothra/', include('mothra.foo.urls')),
# Uncomment the admin/doc line below to enable admin documentation:
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
# Uncomment the next line to enable the admin:
url(r'^', include('signuplogin.urls')),
url(r'^', include('website.urls')),
url(r'^workflows/', include('workflows.urls')),
url(r'^admin/', include(admin.site.urls)),
url('^' + LOGIN_URL[1:] + '$', 'django.contrib.auth.views.login', name='login'),
url(r'^logout/$', 'django.contrib.auth.views.logout', name='logout'),
url(r'^change-password/$', 'django.contrib.auth.views.password_change', name='password change'),
url(r'^password-changed/$', 'django.contrib.auth.views.password_change_done', name='password change done'),
url(r'^password_reset/$', 'django.contrib.auth.views.password_reset'),
url(r'^password_reset/done/$', 'django.contrib.auth.views.password_reset_done'),
url(r'^reset/(?P<uidb36>[0-9A-Za-z]{1,13})-(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', 'django.contrib.auth.views.password_reset_confirm'),
url(r'^reset/done/$', 'django.contrib.auth.views.password_reset_complete'),
) )
## debug stuff to serve static media
if DEBUG:
urlpatterns += patterns('',
(r'^media/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': STATIC_DOC_ROOT}),
)
\ No newline at end of file
...@@ -2,7 +2,9 @@ Django==1.4.1 ...@@ -2,7 +2,9 @@ Django==1.4.1
PIL==1.1.7 PIL==1.1.7
PySimpleSOAP==1.05a PySimpleSOAP==1.05a
South==0.7.6 South==0.7.6
Werkzeug==0.8.3
django-extensions==0.9 django-extensions==0.9
django-orderable-inlines==0.0.6 django-orderable-inlines==0.0.6
django-picklefield==0.2.1 django-picklefield==0.2.1
httplib2==0.7.5
wsgiref==0.1.2 wsgiref==0.1.2
from django.db import models
# Create your models here.
#signup_login {
width:800px;
padding:20px 20px 10px 20px;
overflow:auto;
}
#signup_login #whoa {
font-size:24px;
color:#00c;
text-align:center;
font-weight:700;
margin:0px 0px 20px 0px;
}
#signup_login .mini-title, #avatar_win .mini-title {
display:block;
font-size:24px;
line-height:24px;
margin-bottom:12px;
font-weight:700;
}
#signup_login #signup {
width:379px;
padding-right:20px;
float:left;
border-right:1px solid #aaa;
}
#signup_login #login {
width:380px;
padding-left:20px;
float:left;
}
#signup_login form {
font-size:12px;
font-weight:700;
}
#signup_login form label {
display:block;
line-height:12px;
margin-top:10px;
}
#signup_login form input[type="submit"] {
margin-top:20px;
padding:10px;
}
#signup_login form input[type="text"] {
width:200px;
padding:2px;
}
#signup_login form input[type="text"]:focus {
background-color:#ffd;
}
#signup_login form input[type="password"] {
width:200px;
padding:2px;
}
#signup_login form input[type="password"]:focus {
background-color:#ffd;
}
#close_this {
text-align:center;
padding-bottom:10px;
font-size:12px;
}
.invisible {
display: none;
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment