Commits

Garth Johnson committed 873bf7b

mass commit of untested changes

  • Participants
  • Parent commits 0a9f7b5

Comments (0)

Files changed (5)

CHANGELOG.rst

Empty file added.
-===========
 django-chameleon
-===========
+****************
 
-A Django app that will create a pluggable django-cms theme app within your project..
+.. django-chameleon:: A Django app that will create a pluggable django-cms theme app within your project..
 
 Dependencies
 ============

chameleon/__init__.py

 # -*- coding: utf-8 -*-
-VERSION = (0,0,2,'alpha',2)
+VERSION = (0,0,2,'alpha',3)
 
 def get_version(version=None):
     """Derives a PEP386-compliant version number from VERSION."""

chameleon/templatetags/chameleon.py

 from django.template import Node
 from django.template import TemplateSyntaxError, Library
 from django.conf import settings
+from livesettings import config_value
 register = Library()
 
 class GetCurrentTheme(Node):
         self.variable = variable
 
     def render(self, context):
-        context['THEME_NAME'] = self.variable
 
-        ##TODO: this is a temp hack - need to replace this with a lookup from a dictionary in settings
-        context['THEME_URL'] = settings.STATIC_URL + self.variable + "/"
+        context.update({
+            'THEME_NAME': self.variable,
+            
+        
+            ##TODO: this is a temp hack - need to replace this with a dynamic lookup
+            'THEME_URL': settings.STATIC_URL + self.variable + "/",
 
+            # Live Settings values
+            'CONTENT_SLOGAN': config_value('CONTENT','CONTENT_SLOGAN'),
+            'CONTENT_COPYRIGHT': config_value('CONTENT','CONTENT_COPYRIGHT'),
+            'CONTENT_SOCIAL': config_value('CONTENT','CONTENT_SOCIAL'),
+            #'Logo': config_value('CONTENT','Logo'),
+
+            'PAGE_WIDTH': config_value('LAYOUT','PAGE_WIDTH'),
+            'PAGE_MIN': config_value('LAYOUT','PAGE_MIN'),
+            'PAGE_SHADOW': config_value('LAYOUT','PAGE_SHADOW'),
+            'PAGE_BORDER': config_value('LAYOUT','PAGE_BORDER'),
+
+            'COLORS_TEXT_BASE': config_value('COLORS','COLORS_TEXT_BASE'),
+            'COLORS_TEXT_EMPHASIZED': config_value('COLORS','COLORS_TEXT_EMPHASIZED'),
+            'COLORS_TEXT_SUBDUED': config_value('COLORS','COLORS_TEXT_SUBDUED'),
+
+            'ANALYTICS': config_value('GOOGLE','ANALYTICS'),
+            'ANALYTICS_CODE': config_value('GOOGLE','ANALYTICS_CODE'),
+        })
+        
+        #settings.COMPRESS_TEMPLATE_FILTER_CONTEXT = context
+
+        
         return ''
 
 @register.tag("set_theme_id")
 #!/usr/bin/env python2
 from setuptools import setup, find_packages
+import os
 
 version = __import__('chameleon').get_version()
+here = os.path.dirname(os.path.abspath(__file__))
 
-install_requires = [
-    'Django>=1.4',
-    'django-cms>=2.3.5',
-    'django-compressor',
-]
+## Get long_description from README:
+f = open(os.path.join(here, 'README.rst'))
+long_description = f.read().strip()
+f.close()
+f = open(os.path.join(here, 'CHANGELOG.rst'))
+long_description += "\n\n" + f.read()
+f.close()
 
-dependency_links = [
-    ]
 
 setup(
     name = "django-chameleon",
     version = version,
     url = 'https://bitbucket.org/oddotterco/django-chameleon',
-    license = 'BSD',
-    platforms=['Linux'],
+    license = 'New BSD License',
+    platforms=['any'],
     description = "A Django app that will create a pluggable django-cms theme app within your project.",
+    long_description = long_description,
     keywords='django, cms, theme',
     author = "Odd Otter Co",
     author_email = 'chameleon@oddotter.com',
     packages = find_packages(),
-    install_requires = install_requires,
-    dependency_links = dependency_links,
+    install_requires = [
+        'Django>=1.4',
+        'django-cms>=2.3.5',
+        'django-compressor',
+        ],
+    dependency_links = [],
     include_package_data = True,
     zip_safe = False,
     classifiers = [
-        'Development Status :: 2 - Pre-Alpha',
+        'Development Status :: 3 - Alpha',
         'Framework :: Django',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],
-    package_dir = {
-        'chameleon': 'chameleon',
-    },
 
     entry_points = {
         'console_scripts': [