init
This commit is contained in:
parent
c53725b502
commit
bbaebfd515
|
@ -39,11 +39,8 @@ INSTALLED_APPS = [
|
|||
'django.contrib.sessions',
|
||||
'django.contrib.messages',
|
||||
'django.contrib.staticfiles',
|
||||
'polls',
|
||||
'blog',
|
||||
'imagehost',
|
||||
'pfm',
|
||||
'taggit',
|
||||
#'taggit',
|
||||
]
|
||||
|
||||
MIDDLEWARE_CLASSES = [
|
||||
|
@ -80,14 +77,25 @@ WSGI_APPLICATION = 'mysite.wsgi.application'
|
|||
|
||||
# Database
|
||||
# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
|
||||
|
||||
'''
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.sqlite3',
|
||||
'NAME': os.path.join(BASE_DIR, '../db.sqlite3'),
|
||||
}
|
||||
}
|
||||
'''
|
||||
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
||||
'NAME': 'mysite',
|
||||
'USER': 'anya',
|
||||
'PASSWORD': 'pupsi4ek',
|
||||
'HOST': '127.0.0.1',
|
||||
'PORT': '5432',
|
||||
}
|
||||
}
|
||||
|
||||
# Password validation
|
||||
# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
|
||||
|
|
|
@ -18,8 +18,7 @@ from django.contrib import admin
|
|||
from django.conf import settings
|
||||
from django.conf.urls.static import static
|
||||
from django.views.generic.base import TemplateView
|
||||
urlpatterns = patterns('',
|
||||
urlpatterns = [
|
||||
url(r'^admin/', admin.site.urls),
|
||||
url(r'^$', TemplateView.as_view(template_name='main.html')),
|
||||
url(r'^pfm/', include('pfm.urls')),
|
||||
) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
url(r'^', include('pfm.urls')),
|
||||
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
<!-- Dropdown Structure -->
|
||||
<ul id="dropdown-content">
|
||||
<li><a class="blue-text" href="/admin">Admin</a></li>
|
||||
<li><a class="blue-text" href="/pfm/logout">Exit</a></li>
|
||||
<li><a class="blue-text" href="/logout">Exit</a></li>
|
||||
</ul>
|
||||
|
||||
<!-- Navigation -->
|
||||
|
|
Loading…
Reference in New Issue