Skip to content
Browse files

added geocamUtil; started configuration

  • Loading branch information...
1 parent b95b4e3 commit 261c46e353a0379346053db8ff97b33e06d33116 @trey0 trey0 committed Aug 8, 2012
Showing with 59 additions and 2 deletions.
  1. +6 −0 .gitmodules
  2. +1 −0 apps/geocamTiePoint
  3. +1 −2 siteSettings.py
  4. +1 −0 submodules/geocamTiePoint
  5. +1 −0 submodules/geocamUtilWeb
  6. +49 −0 urls.py
View
6 .gitmodules
@@ -1,3 +1,9 @@
[submodule "submodules/geocamAppEngineLibs"]
path = submodules/geocamAppEngineLibs
url = git://github.com/geocam/geocamAppEngineLibs.git
+[submodule "submodules/geocamTiePoint"]
+ path = submodules/geocamTiePoint
+ url = git://github.com/geocam/geocamTiePoint.git
+[submodule "submodules/geocamUtilWeb"]
+ path = submodules/geocamUtilWeb
+ url = git://github.com/geocam/geocamUtilWeb.git
View
1 apps/geocamTiePoint
View
3 siteSettings.py
@@ -124,8 +124,7 @@
# templates. We suggest putting your apps above standard apps
# so your apps can override templates as needed.
INSTALLED_APPS = (
- # Put your installed apps here!
- # 'geocamAwesome'
+ 'geocamTiePoint',
'geocamUtil',
1 submodules/geocamTiePoint
@@ -0,0 +1 @@
+Subproject commit 2c04076206dc858d8abd97ee36c99e10170b4f99
1 submodules/geocamUtilWeb
@@ -0,0 +1 @@
+Subproject commit d3b5f6d481422c3b4d2e301cae15d544b6beab80
View
49 urls.py
@@ -0,0 +1,49 @@
+# __BEGIN_LICENSE__
+# Copyright (C) 2008-2010 United States Government as represented by
+# the Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+# __END_LICENSE__
+
+from django.conf.urls.defaults import * # pylint: disable=W0401
+from django.conf import settings
+from django.contrib import admin
+admin.autodiscover()
+
+urlpatterns = patterns(
+ '',
+
+ url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+ url(r'^admin/', include(admin.site.urls)),
+
+ url(r'^accounts/login/$', 'django.contrib.auth.views.login',
+ {'loginRequired': False, # avoid redirect loop
+ }, 'login'),
+ url(r'^accounts/logout/$', 'django.contrib.auth.views.logout',
+ # show logout page instead of redirecting to log in again
+ {'loginRequired': False},
+ 'logout'),
+
+ url(r'^', include('geocamTiePoint.urls')),
+
+)
+
+if settings.USE_STATIC_SERVE:
+ urlpatterns += patterns(
+ '',
+
+ url(r'^media/(?P<path>.*)$',
+ 'geocamUtil.views.staticServeWithExpires.staticServeWithExpires',
+ dict(document_root=settings.MEDIA_ROOT,
+ show_indexes=True,
+ readOnly=True)),
+
+ url(r'^static/(?P<path>.*)$',
+ 'geocamUtil.views.staticServeWithExpires.staticServeWithExpires',
+ dict(document_root=settings.STATIC_ROOT,
+ show_indexes=True,
+ readOnly=True)),
+
+ url(r'^favicon.ico$', 'django.views.generic.simple.redirect_to',
+ {'url': settings.STATIC_URL + 'responderMaps/icons/responderMaps.ico',
+ 'readOnly': True}),
+ )

0 comments on commit 261c46e

Please sign in to comment.
Something went wrong with that request. Please try again.