Commits

Kai Diefenbach committed 599b34f Draft

Several updates for mr.developer, compress, etc.

Comments (0)

Files changed (3)

 [buildout]
+extensions = mr.developer
+auto-checkout = *
+versions = versions
+
 parts =
     django
-    django-fcgi
-    django-gunicorn    
-    lfc
-    lfc_blog
-    lfc_contact_form
-    lfc_compositor
-    lfc_development_tools
-    lfc_theme
-    permissions
-    portlets
-    resources    
-    tagging
-    workflows
+    django-gunicorn
 
 [versions]
-django = 1.3
+django = 1.4.1
 
-[lfc]
-recipe = hgrecipe
-repository = http://bitbucket.org/diefenbach/django-lfc/
-
-[lfc_blog]
-recipe = hgrecipe
-repository = http://bitbucket.org/diefenbach/lfc-blog
-
-[lfc_contact_form]
-recipe = hgrecipe
-repository = http://bitbucket.org/diefenbach/lfc_contact_form
-
-[lfc_compositor]
-recipe = hgrecipe
-repository = http://bitbucket.org/diefenbach/lfc-compositor
-
-[lfc_development_tools]
-recipe = hgrecipe
-repository = http://bitbucket.org/diefenbach/lfc_development_tools
-
-[lfc_theme]
-recipe = hgrecipe
-repository = http://bitbucket.org/diefenbach/lfc-theme
-
-[permissions]
-recipe = hgrecipe
-repository = http://bitbucket.org/diefenbach/django-permissions
-
-[portlets]
-recipe = hgrecipe
-repository = http://bitbucket.org/diefenbach/django-portlets
-
-[resources]
-recipe = hgrecipe
-repository = http://bitbucket.org/diefenbach/django-resources
-
-[tagging]
-recipe = hgrecipe
-repository = http://bitbucket.org/diefenbach/django-tagging-inheritance
-
-[workflows]
-recipe = hgrecipe
-repository = http://bitbucket.org/diefenbach/django-workflows
-
-[django-fcgi]
-recipe = collective.recipe.template
-port  = 8000
-input = ${buildout:directory}/misc/conf/django-fcgi.sh.in
-output = ${buildout:directory}/bin/django-fcgi.sh
+[sources]
+lfc = hg ssh://hg@bitbucket.org/diefenbach/django-lfc
+lfc_theme = hg ssh://hg@bitbucket.org/diefenbach/lfc_theme
+lfc_page = hg ssh://hg@bitbucket.org/diefenbach/lfc_page
+lfc_portlets = hg ssh://hg@bitbucket.org/diefenbach/lfc_portlets
+lfc_bench = hg ssh://hg@bitbucket.org/diefenbach/lfc_bench
+lfc_blog = hg ssh://hg@bitbucket.org/diefenbach/lfc_blog
+lfc_contact_form = hg ssh://hg@bitbucket.org/diefenbach/lfc_contact_form
+lfc_development_tools = hg ssh://hg@bitbucket.org/diefenbach/lfc_development_tools
+lfc_rss_tags = hg ssh://hg@bitbucket.org/diefenbach/lfc_rss_tags
+lfc_compositor = hg ssh://hg@bitbucket.org/diefenbach/lfc_compositor
+tagging = hg ssh://hg@bitbucket.org/diefenbach/django-tagging-inheritance
+permissions = hg http://bitbucket.org/diefenbach/django_permissions
+portlets = hg http://bitbucket.org/diefenbach/django_portlets
+workflows = hg http://bitbucket.org/diefenbach/django_workflows
 
 [django-gunicorn]
 recipe = collective.recipe.template
 [django]
 recipe = djangorecipe
 eggs =
-    Pillow
+    pillow
     feedparser
-    cssutils
-    jsmin
-    pysqlite
     gunicorn
     django-pagination
     django-extensions
+    django-debug-toolbar
+    django-compressor
 
 project = lfc_project
 settings=settings
 extra-paths =
     ${buildout:directory}/lfc_project
-    ${lfc:location}
-    ${lfc_blog:location}
-    ${lfc_contact_form:location}
-    ${lfc_compositor:location}
-    ${lfc_development_tools:location}
-    ${lfc_theme:location}
-    ${permissions:location}
-    ${portlets:location}
-    ${resources:location}
-    ${tagging:location}
-    ${workflows:location}
+    ${buildout:directory}/src/lfc
+    ${buildout:directory}/src/lfc_theme
+    ${buildout:directory}/src/lfc_bench
+    ${buildout:directory}/src/lfc_blog
+    ${buildout:directory}/src/lfc_page
+    ${buildout:directory}/src/lfc_portlets
+    ${buildout:directory}/src/portlets
+    ${buildout:directory}/src/permissions
+    ${buildout:directory}/src/workflows
+    ${buildout:directory}/src/lfc_contact_form
+    ${buildout:directory}/src/lfc_development_tools
+    ${buildout:directory}/src/lfc_compositor
+    ${buildout:directory}/src/lfc_rss_tags
+    ${buildout:directory}/src/lfc_folder
+    ${buildout:directory}/src/tagging
 
 urls = lfc_project/urls

lfc_project/settings.py

 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
-RESOURCES_DEBUG = DEBUG
+COMPRESS_ENABLED = False
+COMPRESS_CACHE_BACKEND = 'locmem:///'
 
 ADMINS = (
     # ('name', 'email'),
 # to load the internationalization machinery.
 USE_I18N = True
 
+# static files settings
+STATIC_URL = '/static/'
+STATIC_ROOT = DIRNAME + "/sitestatic"
+
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
 MEDIA_ROOT = DIRNAME + "/media"
     "lfc.utils.middleware.LFCMiddleware",
     "lfc_developement_tools.middleware.AJAXSimpleExceptionResponse",
     "lfc_developement_tools.middleware.ProfileMiddleware",
+    # 'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
 ROOT_URLCONF = 'urls'
 )
 
 INSTALLED_APPS = (
+    "compressor",
     "lfc_theme",
     "django.contrib.admin",
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
+    'django.contrib.staticfiles',
     "django.contrib.flatpages",
     "django.contrib.sitemaps",
     "django.contrib.comments",
     "django_extensions",
     "lfc",
+    "lfc_page",
     "lfc_blog",
+    "lfc_bench",
     "lfc_contact_form",
     "lfc_compositor",
+    "lfc_portlets",
     "portlets",
     "tagging",
     "pagination",
     "workflows",
     "permissions",
-    "resources",
     "gunicorn",
+    "lfc_rss_tags",
+    # "debug_toolbar",
 )
 
 # For sql_queries
     'django.contrib.auth.context_processors.auth',
     'django.core.context_processors.request',
     'django.core.context_processors.media',
+    'django.core.context_processors.static',
     'django.core.context_processors.i18n',
     'lfc.context_processors.main',
 )
             "format": "%(levelname)s %(message)s",
             "datefmt": "%a, %d %b %Y %H:%M:%S",
          },
-    },    
+    },
     "handlers": {
          "console":{
             "level":"DEBUG",
             'formatter': 'verbose',
             'filename': '/Users/Kai/Temp/lfc.log',
             'mode': 'a',
-        },            
-    },        
+        },
+    },
     "loggers": {
         "default": {
             "handlers": ["logfile"],
 LFC_MANAGE_PERMISSIONS =  True
 LFC_MANAGE_APPLICATIONS = True
 LFC_MANAGE_USERS = True
+
+LFC_MANAGE_META_DATA = True
 LFC_MANAGE_SEO =  True
-LFC_MANAGE_COMMENTS =  True
+LFC_MANAGE_COMMENTS = True
+LFC_MANAGE_PORTLETS = True
+LFC_MANAGE_IMAGES = True
+LFC_MANAGE_FILES = True
 
 LFC_TAGS = [
     "lfc_tags",

lfc_project/urls.py

 import os
 
 # django imports
+from django.conf import settings
 from django.conf.urls.defaults import *
 from django.contrib import admin
 from django.contrib.auth.views import login, logout
 
 handler500 = 'lfc.views.fiveohoh'
 
-# Django 
+# Django
 urlpatterns = patterns('',
     url('^accounts/login/?$', login, {"template_name" : "admin/login.html"}, name='auth_login'),
     url('^accounts/logout/?$', logout, name='auth_logout'),
-
     (r'^admin/', include(admin.site.urls)),
-    (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': os.path.join(DIRNAME, "media"), 'show_indexes': True }),
+    (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT, 'show_indexes': True }),
+    (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT, 'show_indexes': True }),
 )
 
 # LFC Blog
     (r'^manage', include('lfc.manage.urls')),
     (r'^manage/', include('lfc.manage.urls')),
     (r'', include('lfc.urls')),
-)
+)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.