Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

settings cleanup & media skeleton

  • Loading branch information...
commit daf2aef4860408479d614415591c8c92f1906f44 1 parent bab049c
@alexanderad authored
View
1  .gitignore
@@ -1,3 +1,4 @@
*.pyc
*~
*.orig
+local_settings.py
View
113 settings.py
@@ -1,95 +1,37 @@
-# Django settings for linky project.
+# -*- coding: utf-8 -*-
+# Django settings for linky project
+from os.path import join, dirname, abspath
-DEBUG = True
+PROJECT_ROOT = abspath(dirname(__file__))
+
+DEBUG = False
TEMPLATE_DEBUG = DEBUG
-ADMINS = (
- # ('Your Name', 'your_email@example.com'),
+ADMINS = (
+ #('Konstantin Volia', 'kostyg@gmail.com'),
+ #('Nata Obvintseva', 'nata@natkitten.name'),
+ ('Alexander Schapov', 'alexanderad@gmail.com'),
)
MANAGERS = ADMINS
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
- 'NAME': '', # Or path to database file if using sqlite3.
- 'USER': '', # Not used with sqlite3.
- 'PASSWORD': '', # Not used with sqlite3.
- 'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
- 'PORT': '', # Set to empty string for default. Not used with sqlite3.
- }
-}
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# On Unix systems, a value of None will cause Django to use the same
-# timezone as the operating system.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'America/Chicago'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
+TIME_ZONE = 'Europe/Kiev'
LANGUAGE_CODE = 'en-us'
-
SITE_ID = 1
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
USE_I18N = True
+USE_L10N = False
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale
-USE_L10N = True
-
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = ''
-
-# Absolute path to the directory static files should be collected to.
-# Don't put anything in this directory yourself; store your static files
-# in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = ''
-
-# URL prefix for static files.
-# Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/static/'
-
-# URL prefix for admin static files -- CSS, JavaScript and images.
-# Make sure to use a trailing slash.
-# Examples: "http://foo.com/static/admin/", "/static/admin/".
-ADMIN_MEDIA_PREFIX = '/static/admin/'
-
-# Additional locations of static files
-STATICFILES_DIRS = (
- # Put strings here, like "/home/html/static" or "C:/www/django/static".
- # Always use forward slashes, even on Windows.
- # Don't forget to use absolute paths, not relative paths.
-)
+# serve media in old-school style :)
+MEDIA_ROOT = join(PROJECT_ROOT, 'static/')
+MEDIA_URL = '/static'
-# List of finder classes that know how to find static files in
-# various locations.
-STATICFILES_FINDERS = (
- 'django.contrib.staticfiles.finders.FileSystemFinder',
- 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
-# Make this unique, and don't share it with anybody.
SECRET_KEY = ')v=tn^zxz9@be5qd69a2f&2!h+$!2^+wgi*y573j^dlfu4^+be'
-# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
-# 'django.template.loaders.eggs.Loader',
)
MIDDLEWARE_CLASSES = (
@@ -103,9 +45,7 @@
ROOT_URLCONF = 'linky.urls'
TEMPLATE_DIRS = (
- # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
- # Always use forward slashes, even on Windows.
- # Don't forget to use absolute paths, not relative paths.
+ join(PROJECT_ROOT, 'templates/')
)
INSTALLED_APPS = (
@@ -113,19 +53,11 @@
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
- 'django.contrib.messages',
- 'django.contrib.staticfiles',
- # Uncomment the next line to enable the admin:
- # 'django.contrib.admin',
- # Uncomment the next line to enable admin documentation:
- # 'django.contrib.admindocs',
+ 'django.contrib.messages',
+
+ 'south',
)
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
LOGGING = {
'version': 1,
'disable_existing_loggers': False,
@@ -143,3 +75,10 @@
},
}
}
+
+APPEND_SLASH = False
+
+try:
+ from local_settings import *
+except ImportError:
+ pass
View
0  static/css/index.html
No changes.
View
0  static/images/index.html
No changes.
View
0  static/index.html
No changes.
View
0  static/js/index.html
No changes.
View
22 urls.py
@@ -1,17 +1,13 @@
+# -*- coding: utf-8 -*-
from django.conf.urls.defaults import patterns, include, url
-
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
+from django.conf import settings
urlpatterns = patterns('',
- # Examples:
- # url(r'^$', 'linky.views.home', name='home'),
- # url(r'^linky/', include('linky.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'^admin/', include(admin.site.urls)),
)
+
+# old school MEDIA
+if settings.DEBUG:
+ urlpatterns += patterns('',
+ (r'^(static)/(?P<path>.*)$', 'django.views.static.serve',
+ {'document_root': settings.MEDIA_ROOT}),
+ )
Please sign in to comment.
Something went wrong with that request. Please try again.