From a6d6e5077c7a6d6581004e54abc79a9d0723905c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 7 Jun 2013 17:05:38 +0200 Subject: Simplification --- media/icons/marker.png | Bin 606 -> 0 bytes media/icons/readme | 1 - media/pictures/readme | 1 - media/route_files/readme | 1 - settings.py | 8 +++++++- 5 files changed, 7 insertions(+), 4 deletions(-) delete mode 100755 media/icons/marker.png delete mode 100644 media/icons/readme delete mode 100644 media/pictures/readme delete mode 100644 media/route_files/readme diff --git a/media/icons/marker.png b/media/icons/marker.png deleted file mode 100755 index ccd1913..0000000 Binary files a/media/icons/marker.png and /dev/null differ diff --git a/media/icons/readme b/media/icons/readme deleted file mode 100644 index 560759a..0000000 --- a/media/icons/readme +++ /dev/null @@ -1 +0,0 @@ -Icons are stored here diff --git a/media/pictures/readme b/media/pictures/readme deleted file mode 100644 index c0d20b7..0000000 --- a/media/pictures/readme +++ /dev/null @@ -1 +0,0 @@ -Pictures are stored here diff --git a/media/route_files/readme b/media/route_files/readme deleted file mode 100644 index 90d72ab..0000000 --- a/media/route_files/readme +++ /dev/null @@ -1 +0,0 @@ -Route files are stored here diff --git a/settings.py b/settings.py index eaeac4a..cb2199b 100644 --- a/settings.py +++ b/settings.py @@ -4,7 +4,7 @@ # Don't edit this file: # overload all theses settings in your local_settings.py file -import os +import os, sys DEBUG = False TEMPLATE_DEBUG = DEBUG @@ -81,6 +81,9 @@ CHIMERE_THUMBS_SCALE_WIDTH=None CHIMERE_CSV_ENCODING = 'ISO-8859-1' +# generic contact email +CONTACT_EMAIL = '' + ADMINS = ( # ('Your Name', 'your_email@domain.com'), ) @@ -98,6 +101,9 @@ DATABASES = { }, } +if 'test' in sys.argv: + SOUTH_TESTS_MIGRATE = False + # Local time zone for this installation. Choices can be found here: # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE # although not all variations may be possible on all operating systems. -- cgit v1.2.3 From 55d98517fede51fb945f48ecb73a02e52ebd4158 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 7 Jun 2013 17:22:53 +0200 Subject: Better management of static files --- .gitignore | 4 ++++ project_static/.project_static | 0 settings.py | 2 ++ 3 files changed, 6 insertions(+) create mode 100644 .gitignore create mode 100644 project_static/.project_static diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2aac5f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +media/* +local_settings.py +static/* +*.pyc diff --git a/project_static/.project_static b/project_static/.project_static new file mode 100644 index 0000000..e69de29 diff --git a/settings.py b/settings.py index 5d554ce..019b675 100644 --- a/settings.py +++ b/settings.py @@ -17,6 +17,8 @@ EMAIL_HOST = 'localhost' STATIC_URL = '/static/' STATIC_ROOT = ROOT_PATH + 'static/' +STATICFILES_DIRS = (ROOT_PATH + 'project_static',) + TINYMCE_URL = '/tinymce/' JQUERY_JS_URLS = ('/javascript/jquery/jquery.js', '/javascript/jquery-ui/jquery-ui.js',) -- cgit v1.2.3