From b0653d2c959b017cae95c49cea2064f770301d79 Mon Sep 17 00:00:00 2001 From: sanj Date: Mon, 25 Oct 2010 20:52:50 +0200 Subject: [PATCH] updated google api key --- rizk/egypt/views.py | 4 ++-- rizk/settings.py | 13 ++++++++++++- rizk/urls.py | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/rizk/egypt/views.py b/rizk/egypt/views.py index 1be5383..fcb690b 100644 --- a/rizk/egypt/views.py +++ b/rizk/egypt/views.py @@ -23,8 +23,8 @@ def geojson(request): return render_to_json_response(d) def index(request): - - return render_to_response('flyovers.html', {'questions': QUESTIONS}) + events = Event.objects.all().order_by('start_time') + return render_to_response('rizk.html', {'events': events}) def flyover(request): i = request.GET['id'] diff --git a/rizk/settings.py b/rizk/settings.py index 4b0968e..1fec6d1 100644 --- a/rizk/settings.py +++ b/rizk/settings.py @@ -15,7 +15,7 @@ ADMINS = ( ) MANAGERS = ADMINS -GOOGLE_MAPS_API_KEY = 'ABQIAAAAsn1j-ZGGtRgZ9aMJPCZbRxTEwe8r4EmncxniwLCEI2F-aeUoNRTBAUi3uvVAsZpLkcO78Ryd18Hfaw' +GOOGLE_MAPS_API_KEY = 'ABQIAAAAsn1j-ZGGtRgZ9aMJPCZbRxQ7qtcPomt5R65jYWcqt6293S9jUBRFELNu52BN---sow276q3W0R-Hvg' DATABASE_ENGINE = 'mysql' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. DATABASE_NAME = 'rizk' # Or path to database file if using sqlite3. DATABASE_USER = 'root' # Not used with sqlite3. @@ -57,6 +57,15 @@ ADMIN_MEDIA_PREFIX = '/admin/media/' # Make this unique, and don't share it with anybody. SECRET_KEY = ')s6v_j@m(o3n5qm0i^2h+#q3v+ltwkklkbxp#gz)#9vm_#-7&z' +TEMPLATE_CONTEXT_PROCESSORS = ( + "django.core.context_processors.auth", + "django.core.context_processors.debug", + "django.core.context_processors.i18n", + "django.core.context_processors.media", +# "multilingual.context_processors.multilingual", + ) + + # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.load_template_source', @@ -68,6 +77,7 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'debug_toolbar.middleware.DebugToolbarMiddleware', ) ROOT_URLCONF = 'urls' @@ -87,6 +97,7 @@ INSTALLED_APPS = ( 'django.contrib.admin', 'django.contrib.gis', 'egypt', + 'debug_toolbar', ) #overwrite default settings with local settings diff --git a/rizk/urls.py b/rizk/urls.py index f761c82..c69da1e 100644 --- a/rizk/urls.py +++ b/rizk/urls.py @@ -12,7 +12,7 @@ urlpatterns = patterns('', # Uncomment the admin/doc line below and add 'django.contrib.admindocs' # to INSTALLED_APPS to enable admin documentation: # (r'^admin/doc/', include('django.contrib.admindocs.urls')), -# (r'^$', 'flyovers.views.index'), + (r'^$', 'egypt.views.index'), # (r'^geojson$', 'flyovers.views.geojson'), # (r'^flyover$', 'flyovers.views.flyover'), # (r'^category$', 'flyovers.views.category'),