summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chimere/static/chimere/img/email.png (renamed from example_project/static/icons/email.png)bin735 -> 735 bytes
-rw-r--r--chimere/static/chimere/img/facebook.png (renamed from example_project/static/icons/facebook.png)bin731 -> 731 bytes
-rw-r--r--chimere/static/chimere/img/identica.png (renamed from example_project/static/icons/identica.png)bin1373 -> 1373 bytes
-rw-r--r--chimere/static/chimere/img/twitter.png (renamed from example_project/static/icons/twitter.png)bin924 -> 924 bytes
-rw-r--r--example_project/settings.py26
5 files changed, 14 insertions, 12 deletions
diff --git a/example_project/static/icons/email.png b/chimere/static/chimere/img/email.png
index 1a0a014..1a0a014 100644
--- a/example_project/static/icons/email.png
+++ b/chimere/static/chimere/img/email.png
Binary files differ
diff --git a/example_project/static/icons/facebook.png b/chimere/static/chimere/img/facebook.png
index 8036b19..8036b19 100644
--- a/example_project/static/icons/facebook.png
+++ b/chimere/static/chimere/img/facebook.png
Binary files differ
diff --git a/example_project/static/icons/identica.png b/chimere/static/chimere/img/identica.png
index a9625d1..a9625d1 100644
--- a/example_project/static/icons/identica.png
+++ b/chimere/static/chimere/img/identica.png
Binary files differ
diff --git a/example_project/static/icons/twitter.png b/chimere/static/chimere/img/twitter.png
index 295767a..295767a 100644
--- a/example_project/static/icons/twitter.png
+++ b/chimere/static/chimere/img/twitter.png
Binary files differ
diff --git a/example_project/settings.py b/example_project/settings.py
index 43c0b40..9b20a11 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -128,18 +128,6 @@ MEDIA_ROOT = ROOT_PATH + 'media/'
# Example: "http://media.lawrence.com"
MEDIA_URL = '/' + EXTRA_URL + 'media/'
-# share with
-SHARE_NETWORKS = (
-("Email", 'mailto:?subject=%(text)s&body=%(url)s',
- STATIC_URL + 'icons/email.png'),
-("Facebook", 'http://www.facebook.com/sharer.php?t=%(text)s&u=%(url)s',
- STATIC_URL + 'icons/facebook.png'),
-("Twitter", 'http://twitter.com/home?status=%(text)s %(url)s',
- STATIC_URL + 'icons/twitter.png'),
-("Identi.ca", 'http://identi.ca/index.php?action=newnotice&status_textarea=%(text)s %(url)s',
- STATIC_URL + 'icons/identica.png'),
-)
-
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
# Examples: "http://foo.com/media/", "/media/".
@@ -248,3 +236,17 @@ try:
except ImportError, e:
print 'Unable to load local_settings.py:', e
+if 'SHARE_NETWORKS' not in globals():
+ # after the locals to get the right STATIC_URL
+
+ # share with
+ SHARE_NETWORKS = (
+ ("Email", 'mailto:?subject=%(text)s&body=%(url)s',
+ STATIC_URL + 'chimere/img/email.png'),
+ ("Facebook", 'http://www.facebook.com/sharer.php?t=%(text)s&u=%(url)s',
+ STATIC_URL + 'chimere/img/facebook.png'),
+ ("Twitter", 'http://twitter.com/home?status=%(text)s %(url)s',
+ STATIC_URL + 'chimere/img/twitter.png'),
+ ("Identi.ca", 'http://identi.ca/index.php?action=newnotice&status_textarea=%(text)s %(url)s',
+ STATIC_URL + 'chimere/img/identica.png'),
+ )