From 4028d3de920bfdcc9cc038521109314cdbe66ab6 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 8 May 2012 00:16:22 +0200 Subject: Fix share icons --- chimere/static/chimere/img/email.png | Bin 0 -> 735 bytes chimere/static/chimere/img/facebook.png | Bin 0 -> 731 bytes chimere/static/chimere/img/identica.png | Bin 0 -> 1373 bytes chimere/static/chimere/img/twitter.png | Bin 0 -> 924 bytes example_project/settings.py | 26 ++++++++++++++------------ example_project/static/icons/email.png | Bin 735 -> 0 bytes example_project/static/icons/facebook.png | Bin 731 -> 0 bytes example_project/static/icons/identica.png | Bin 1373 -> 0 bytes example_project/static/icons/twitter.png | Bin 924 -> 0 bytes 9 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 chimere/static/chimere/img/email.png create mode 100644 chimere/static/chimere/img/facebook.png create mode 100644 chimere/static/chimere/img/identica.png create mode 100644 chimere/static/chimere/img/twitter.png delete mode 100644 example_project/static/icons/email.png delete mode 100644 example_project/static/icons/facebook.png delete mode 100644 example_project/static/icons/identica.png delete mode 100644 example_project/static/icons/twitter.png diff --git a/chimere/static/chimere/img/email.png b/chimere/static/chimere/img/email.png new file mode 100644 index 0000000..1a0a014 Binary files /dev/null and b/chimere/static/chimere/img/email.png differ diff --git a/chimere/static/chimere/img/facebook.png b/chimere/static/chimere/img/facebook.png new file mode 100644 index 0000000..8036b19 Binary files /dev/null and b/chimere/static/chimere/img/facebook.png differ diff --git a/chimere/static/chimere/img/identica.png b/chimere/static/chimere/img/identica.png new file mode 100644 index 0000000..a9625d1 Binary files /dev/null and b/chimere/static/chimere/img/identica.png differ diff --git a/chimere/static/chimere/img/twitter.png b/chimere/static/chimere/img/twitter.png new file mode 100644 index 0000000..295767a Binary files /dev/null and b/chimere/static/chimere/img/twitter.png 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'), + ) diff --git a/example_project/static/icons/email.png b/example_project/static/icons/email.png deleted file mode 100644 index 1a0a014..0000000 Binary files a/example_project/static/icons/email.png and /dev/null differ diff --git a/example_project/static/icons/facebook.png b/example_project/static/icons/facebook.png deleted file mode 100644 index 8036b19..0000000 Binary files a/example_project/static/icons/facebook.png and /dev/null differ diff --git a/example_project/static/icons/identica.png b/example_project/static/icons/identica.png deleted file mode 100644 index a9625d1..0000000 Binary files a/example_project/static/icons/identica.png and /dev/null differ diff --git a/example_project/static/icons/twitter.png b/example_project/static/icons/twitter.png deleted file mode 100644 index 295767a..0000000 Binary files a/example_project/static/icons/twitter.png and /dev/null differ -- cgit v1.2.3