mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2024-11-24 00:01:58 +00:00
6776111c6e
Got rid of the url tags in template, replaced them with get_absolute_url method calls where possible. Adding get_absolute_url in models enables direct link to the public model views in admin. The use of get_absolute_url, which is the correct Django way of doing things, eliminates any need for the redundant "href" fields we were using. Those fields now need to be deleted from the models and from the parsers. Made the context processor to pass settings to all templates actually work, although this was a little uglier than expected. I had to put in a new render_response to replace render_to_response. This is because Django uses Context, not RequestContext by default. I wish they would change this, it's annoying. Anyway, I deleted all the manual settings passing in the views. I also eliminated a couple of unnecessary methods and stuff like that.
80 lines
3.2 KiB
Python
80 lines
3.2 KiB
Python
from django.conf.urls.defaults import *
|
|
import troggle.settings as settings
|
|
|
|
from expo.views import * # flat import
|
|
from expo.views_caves import *
|
|
from expo.views_survex import *
|
|
|
|
from django.contrib import admin
|
|
admin.autodiscover()
|
|
|
|
urlpatterns = patterns('',
|
|
|
|
url(r'^$', views_other.frontpage, name="frontpage"),
|
|
|
|
url(r'^caveindex$', views_caves.caveindex, name="caveindex"),
|
|
url(r'^personindex$', views_logbooks.personindex, name="personindex"),
|
|
|
|
|
|
#(r'^person/(?P<person_id>\d*)/?$', views_logbooks.person),
|
|
url(r'^person/(?P<first_name>[A-Z]*[a-z]*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-z]*)/?', views_logbooks.person, name="person"),
|
|
#url(r'^person/(\w+_\w+)$', views_logbooks.person, name="person"),
|
|
|
|
url(r'^expedition/(\d+)$', views_logbooks.expedition, name="expedition"),
|
|
url(r'^personexpedition/(?P<first_name>[A-Z]*[a-z]*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-z]*)/(?P<year>\d+)/?$', views_logbooks.personexpedition, name="personexpedition"),
|
|
url(r'^logbookentry/(.+)$', views_logbooks.logbookentry,name="logbookentry"),
|
|
|
|
url(r'^survexblock/(.+)$', views_caves.survexblock, name="survexblock"),
|
|
url(r'^cavehref/(.+)$', views_caves.cavehref, name="cave"),
|
|
|
|
url(r'^jgtfile/(.*)$', view_surveys.jgtfile, name="jgtfile"),
|
|
url(r'^jgtuploadfile$', view_surveys.jgtuploadfile, name="jgtuploadfile"),
|
|
|
|
|
|
|
|
|
|
|
|
(r'^cave/(?P<cave_id>[^/]+)/?(?P<ent_letter>[^/])$', ent),
|
|
#(r'^cave/(?P<cave_id>[^/]+)/edit/$', edit_cave),
|
|
(r'^cavesearch', caveSearch),
|
|
url(r'^cavearea', caveArea, name="caveArea"),
|
|
|
|
url(r'^survex/(.*?)\.index$', views_survex.index, name="survexindex"),
|
|
url(r'^cave/(?P<cave_id>[^/]+)/?$', views_caves.cavehref), # deprecated
|
|
(r'^survex/(?P<survex_file>.*)\.svx$', svx),
|
|
(r'^survex/(?P<survex_file>.*)\.3d$', threed),
|
|
(r'^survex/(?P<survex_file>.*)\.log$', log),
|
|
(r'^survex/(?P<survex_file>.*)\.err$', err),
|
|
|
|
|
|
url(r'^logbooksearch/(.*)/?$', views_logbooks.logbookSearch),
|
|
|
|
|
|
url(r'^statistics/?$', views_other.stats, name="stats"),
|
|
|
|
url(r'^calendar/(?P<year>\d\d\d\d)/?$', views_other.calendar, name="calendar"),
|
|
|
|
url(r'^survey/?$', surveyindex, name="survey"),
|
|
(r'^survey/(?P<year>\d\d\d\d)\#(?P<wallet_number>\d*)$', survey),
|
|
|
|
(r'^admin/doc/?', include('django.contrib.admindocs.urls')),
|
|
(r'^admin/(.*)', admin.site.root),
|
|
|
|
(r'^accounts/', include('registration.urls')),
|
|
(r'^profiles/', include('profiles.urls')),
|
|
|
|
# (r'^personform/(.*)$', personForm),
|
|
|
|
(r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
|
|
{'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
|
|
|
|
(r'^survey_files/listdir/(?P<path>.*)$', view_surveys.listdir),
|
|
(r'^survey_files/download/(?P<path>.*)$', view_surveys.download),
|
|
#(r'^survey_files/upload/(?P<path>.*)$', view_surveys.upload),
|
|
|
|
(r'^survey_scans/(?P<path>.*)$', 'django.views.static.serve',
|
|
{'document_root': settings.SURVEYS, 'show_indexes':True}),
|
|
|
|
|
|
)
|