converted publishing system to have buttons int the admin and reworked the config system

3 files changed, 94 insertions, 89 deletions

diff --git a/config/base_urls.py b/config/base_urls.py
index 6e9e15f..91ab63d 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -42,13 +42,14 @@ urlpatterns += patterns('',
 
 urlpatterns += patterns('',
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-	(r'^admin/filebrowser/', include('filebrowser.urls')),
+	#(r'^admin/filebrowser/', include('filebrowser.urls')),
+    (r'^admin/build/.*', 'static_generator.views.do_build'),
     (r'^admin/', include(admin.site.urls),),
     (r'^grappelli/', include('grappelli.urls')),
-    (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
+    #(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
     (r'^robots.txt$', direct_to_template, {'template': 'archives/robots.html'}),
     (r'^googleb11655cd59dacf3c.html$', direct_to_template, {'template': 'static/gverify.html'}),
-    (r'^contact/', direct_to_template, {'template': 'details/contact.html'}),
+    #(r'^contact/', direct_to_template, {'template': 'details/contact.html'}),
     (r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
     (r'^writing/', include('blog.urls')),
     (r'^projects/', include('projects.urls')),
@@ -62,7 +63,10 @@ urlpatterns += patterns('',
     # map
     (r'^map/', include('locations.urls')),
     #about
-    (r'^about/$', 'blog.views.about'), #'blog.views.home'),
+    #(r'^about/$', 'blog.views.about'), #'blog.views.home'),
     #homepage
     (r'^$', 'blog.views.home'), #'blog.views.home'),
+    #pages
+    (r'^(?P<slug>[-\w]+)/$', 'pages.views.page'), 
+
 )
diff --git a/config/requirements.txt b/config/requirements.txt
index 6ef8852..cd13a58 100644
--- a/config/requirements.txt
+++ b/config/requirements.txt
@@ -3,6 +3,8 @@ PIL==1.1.7
 django-extensions==0.9
 django-filebrowser==3.5.0
 django-grappelli==2.4.2
+django-pipeline==1.2.17
 psycopg2==2.4.5
 wsgiref==0.1.2
 yolk==0.4.3
+yuicompressor==2.4.7
diff --git a/config/settings/settings.py b/config/settings/settings.py
index e83c772..8b71e3c 100644
--- a/config/settings/settings.py
+++ b/config/settings/settings.py
@@ -1,4 +1,4 @@
-# Django settings for The Installment Plan
+# Django settings for luxagraf.
 import os
 from os.path import dirname, abspath
 
@@ -6,13 +6,11 @@ PROJ_ROOT = abspath(dirname(dirname(dirname(__file__))))+'/'
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
-DEVELOPMENT = False
+
 ADMINS = (
-     ('sng', 'luxagraf@gmail.com'),
-)
-CONTACT = (
-     ('sng', 'sng@luxagraf.net'),
+    # ('Your Name', 'your_email@example.com'),
 )
+
 MANAGERS = ADMINS
 
 DATABASES = {
@@ -24,111 +22,112 @@ DATABASES = {
     }
 }
 
-#Email Setting for Webfaction
-EMAIL_HOST = 'mail2.webfaction.com'
-EMAIL_HOST_USER = 'luxagraf'
-EMAIL_HOST_PASSWORD = 'translinguis#'
-DEFAULT_FROM_EMAIL = 'sng@luxagraf.net'
-SEND_BROKEN_LINK_EMAILS = True
-SERVER_EMAIL = 'sng@luxagraf.net'
-EMAIL_PORT = 25
-
-SITE_NAME = 'luxagraf'
+TIME_ZONE = 'America/New_York'
+LANGUAGE_CODE = 'en-us'
+SITE_ID = 1
 SITE_URL = 'http://luxagraf.net/'
 GRAPPELLI_ADMIN_TITLE =  'Luxagraf Admin'
-
-TIME_ZONE = 'America/New_York'
-
+USE_I18N = False
+USE_L10N = True
+USE_TZ = True
 
 #API key for Google Maps in Admin 
 MAP_API = "google"
 GOOGLE_MAPS_API_KEY = MAP_API_KEY = 'ABQIAAAAEZ0Oz7LFDmdS1OBHm6HLgRQT5Lr-mnFT_29u-YVgAYs_K_u6-BQ627CkPKq44oaHpmSt2497hDj_LQ'
 
-
 # API key for Flickr imports
 FLICKR_API_KEY = '7b9d978a440c6ab65a545adc0aa0d693'
 FLICKR_USER_ID = '85322932@N00'
 
-DELICIOUS_USER = 'luxagraf'
-DELICIOUS_PASS = 'translinguis#'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-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 = False
+#path to the folder that holds the generated html files
+FLATFILES_ROOT = os.path.join(PROJ_ROOT, 'site/')
+#media and image URLs for the generated html files
+BAKED_IMAGES_URL = 'http://images.luxagraf.net/'
+BAKED_MEDIA_URL = 'http://luxagraf.net/media/'
+#BAKED_MEDIA_URL = 'http://127.0.0.1:8000/media/'
+#path to http://images.luxagraf.net root
+IMAGES_ROOT = os.path.join(PROJ_ROOT, 'site/media/images')
+IMAGES_URL = 'http://images.luxagraf.net/'
 
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = PROJ_ROOT+'media/'
-IMAGES_ROOT = PROJ_ROOT+'media/images/'
-STATIC_ROOT = PROJ_ROOT+'static/'
+# Absolute filesystem path to the directory that will hold user-uploaded files.
+# Example: "/home/media/media.lawrence.com/media/"
+MEDIA_ROOT = os.path.join(PROJ_ROOT, 'site/media')
 
-# URL that handles the media served from MEDIA_ROOT.
-# Example: "http://media.lawrence.com"
-MEDIA_URL = 'http://media.luxagraf.net/'
-IMAGES_URL = 'http://images.luxagraf.net/'
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/admin/'
+# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
+MEDIA_URL = 'http://luxagraf.net/media/'
+
+# 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 = os.path.join(PROJ_ROOT, 'static/')
+
+# URL prefix for static files.
+# Example: "http://media.lawrence.com/static/"
+STATIC_URL = '/static/'
+
+# 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.
+)
 
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '-kzv5^z9@j%cvk6u#lcf&nuga4oiy_-6q^-+#iybt44t_ii-1o'
+# 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',
+)
 
-#CACHE_BACKEND = 'memcached://174.133.21.78:32348/'
-#CACHE_MIDDLEWARE_SECONDS = 3600
-#CACHE_MIDDLEWARE_KEY_PREFIX = 'luxagraf_net'
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = '^gaz8-&amp;iy8z@(nwp#xe1age(t141w-47fh=cv8a7w2=x2=a-&amp;7'
 
+# 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 = (
-    'django.middleware.gzip.GZipMiddleware',
-    #'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
-   # 'django.middleware.cache.FetchFromCacheMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.doc.XViewMiddleware',
-    'pagination.middleware.PaginationMiddleware',
-    #'ssl.middleware.SSLRedirect',
-    #'debug_toolbar.middleware.DebugToolbarMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    # Uncomment the next line for simple clickjacking protection:
+    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
+
 TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.core.context_processors.request',
-    'django.contrib.auth.context_processors.auth',
-    'django.core.context_processors.debug',
-    'django.core.context_processors.media',
-    "grappelli.context_processors.admin_template_path",
-)
-ROOT_URLCONF = 'settings.base_urls'
-INTERNAL_IPS = (
-    '67.15.64.48',
-    '63.251.179.56',
-    '127.0.0.1'
+    "django.core.context_processors.request",
+    "django.contrib.auth.context_processors.auth",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.i18n",
+    "django.core.context_processors.media",
+    "django.core.context_processors.static",
+    "django.core.context_processors.tz",
+    "django.contrib.messages.context_processors.messages"
 )
 
+ROOT_URLCONF = 'config.base_urls'
+
 TEMPLATE_DIRS = (
-    PROJ_ROOT+'templates',
-	PROJ_ROOT+'lib/templates',
-	PROJ_ROOT+'lib/grappelli/templates',
-	#PROJ_ROOT+'lib/debug_toolbar/templates',
+    os.path.join(PROJ_ROOT, 'design/templates')
     # 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.
 )
-TEMPLATE_LOADERS = (
-    ('django.template.loaders.cached.Loader', (
-        'django.template.loaders.filesystem.Loader',
-        'django.template.loaders.app_directories.Loader',
-    )),
-)
+
+
 INSTALLED_APPS = (    
     'grappelli',
     'django.contrib.auth',
+    'django.contrib.staticfiles',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
@@ -139,18 +138,18 @@ INSTALLED_APPS = (
     'locations',
     'blog',
     'photos',
-    #'tagging',
     'taggit',
-    #'chunks',
     'links',
     'pagination',
     'templatetags',
-    #'contact_form',
     'projects',
-    'guide'
+    'guide',
+    'static_generator',
+    'pages'
     
 )
-try:
-    from settings_local import *
-except:
-    pass
+DEVELOPMENT = True
+if DEVELOPMENT:
+    INSTALLED_APPS += ('django_extensions',)
+    MEDIA_URL = 'http://127.0.0.1:8000/media/'
+