removed template_utils dependency

Signed-off-by: Brian Rosner <brosner@gmail.com>
bmihelac · Jul 10, 2010 · 950d7e9 · 950d7e9
1 parent 8ef0115
commit 950d7e9
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 22 deletions.
diff --git a/docs/dependencies.txt b/docs/dependencies.txt
@@ -176,8 +176,6 @@ django_wikiapp
     uses apps notification, tagging
     and libraries atomformat, creoleparser, diff_match_patch, docutils
 
-template_utils
-
 
 Pinax Apps Within Projects
 --------------------------

diff --git a/pinax/apps/account/context_processors.py b/pinax/apps/account/context_processors.py
@@ -1,3 +1,5 @@
+from django.conf import settings
+
 from pinax.apps.account.models import Account, AnonymousAccount
 
 
@@ -9,4 +11,7 @@ def account(request):
             account = AnonymousAccount(request)
     else:
         account = AnonymousAccount(request)
-    return {"account": account}
+    return {
+        "account": account,
+        "CONTACT_EMAIL": getattr(settings, "CONTACT_EMAIL", "support@example.com")
+    }
diff --git a/pinax/core/context_processors.py b/pinax/core/context_processors.py
@@ -1,9 +1,10 @@
 from django.conf import settings
+from django.contrib.site.models import Site
 
-from template_utils.context_processors import settings_processor
 
-
-
-pinax_settings = settings_processor(
-    "CONTACT_EMAIL", "SITE_NAME", "STATIC_URL"
-)
+def pinax_settings(request):
+    site = Site.objects.get_current()
+    return {
+        "SITE_NAME": site.name,
+        "SITE_DOMAIN": site.domain
+    }
diff --git a/pinax/projects/basic_project/requirements/base.txt b/pinax/projects/basic_project/requirements/base.txt
@@ -21,6 +21,5 @@ django-pagination==1.0.7
 django-timezones==0.2.dev1
 django-ajax-validation==0.1.3
 django-uni-form==0.7.0
-template_utils==0.4p2
 django-staticfiles==0.2.0
 django-debug-toolbar==0.8.3
diff --git a/pinax/projects/cms_company_project/requirements/base.txt b/pinax/projects/cms_company_project/requirements/base.txt
@@ -26,5 +26,4 @@ django-generic-flatblocks==0.9.1
 django-openid==0.2.3.dev1
 sorl-thumbnail==3.2.5
 django-dbtemplates==0.5.8
-template_utils==0.4p2
 django-staticfiles==0.2.0
diff --git a/pinax/projects/cms_holidayhouse_project/requirements/base.txt b/pinax/projects/cms_holidayhouse_project/requirements/base.txt
@@ -26,5 +26,4 @@ django-generic-flatblocks==0.9.1
 django-openid==0.2.3.dev1
 sorl-thumbnail==3.2.5
 django-dbtemplates==0.5.8
-template_utils==0.4p2
 django-staticfiles==0.2.0
diff --git a/pinax/projects/code_project/requirements/base.txt b/pinax/projects/code_project/requirements/base.txt
@@ -36,7 +36,6 @@ django-attachments==0.3.1
 django-markup==0.3
 django-sorting>=0.1
 django-filter==0.5.3
-template_utils==0.4p2
 django-staticfiles==0.2.0
 django-groups==0.1.dev10
 django-tagging-ext==0.2.0

diff --git a/pinax/projects/company_project/requirements/base.txt b/pinax/projects/company_project/requirements/base.txt
@@ -14,5 +14,4 @@ Pygments==1.3.1
 
 biblion>=0.1.0-dev0
 django-staticfiles==0.2.0
-django-debug-toolbar==0.8.3
-template_utils==0.4p2
+django-debug-toolbar==0.8.3
diff --git a/pinax/projects/intranet_project/requirements/base.txt b/pinax/projects/intranet_project/requirements/base.txt
@@ -36,7 +36,6 @@ django-attachments==0.3.1
 django-markup==0.3
 django-bookmarks==0.1.0
 django-filter==0.5.3
-template_utils==0.4p2
 django-staticfiles==0.2.0
 django-groups==0.1.dev10
 django-tagging-ext==0.2.0

diff --git a/pinax/projects/private_beta_project/requirements/base.txt b/pinax/projects/private_beta_project/requirements/base.txt
@@ -28,6 +28,5 @@ django-bookmarks==0.1.0
 django-ajax-validation==0.1.3
 django-uni-form==0.7.0
 django-wikiapp==0.2.0
-template_utils==0.4p2
 django-staticfiles==0.2.0
 django-debug-toolbar==0.8.3
diff --git a/pinax/projects/sample_group_project/requirements/base.txt b/pinax/projects/sample_group_project/requirements/base.txt
@@ -38,7 +38,6 @@ django-threadedcomments==0.5.2
 django-gravatar==0.1.0
 django-sorting>=0.1
 django-filter==0.5.3
-template_utils==0.4p2
 django-staticfiles==0.2.0
 django-groups==0.1.dev10
 django-tagging-ext==0.2.0

diff --git a/pinax/projects/social_project/requirements/base.txt b/pinax/projects/social_project/requirements/base.txt
@@ -59,7 +59,6 @@ django-wikiapp==0.2.0
 django-photologue==2.3
 django-attachments==0.3.1
 django-markup==0.3
-template_utils==0.4p2
 django-staticfiles==0.2.0
 django-groups==0.1.dev10
 django-tagging-ext==0.2.0
diff --git a/pinax/projects/static_project/requirements/base.txt b/pinax/projects/static_project/requirements/base.txt
@@ -9,4 +9,3 @@ Django==1.2.1
 Pinax
 
 django-staticfiles==0.2.0
-template_utils==0.4p2
diff --git a/pinax/projects/zero_project/requirements/base.txt b/pinax/projects/zero_project/requirements/base.txt
@@ -10,4 +10,4 @@ Pinax
 
 django-debug-toolbar==0.8.3
 django-staticfiles==0.2.0
-template_utils==0.4p2
+django-uni-form==0.7.0
diff --git a/pinax/projects/zero_project/settings.py b/pinax/projects/zero_project/settings.py
@@ -119,6 +119,7 @@
     "django.contrib.messages.context_processors.messages",
 
     "pinax.core.context_processors.pinax_settings",
+    "staticfiles.context_processors.static_url",
 ]
 
 INSTALLED_APPS = [

diff --git a/requirements/pinax.txt b/requirements/pinax.txt
@@ -57,7 +57,6 @@ django-debug-toolbar==0.8.3
 django-tagging-ext==0.2.0
 django-voting==0.1
 django-sorting>=0.1
-template_utils==0.4p2
 django-groups==0.1.dev10
 biblion==0.1.dev6
 django-email-confirmation==0.2.dev2