[svn] Added QM wiki markup. The format is [[cave:204 QM:2005-04A]] with the grade (A) being optional. The links color red if the QM does not exist, and in that case clicking on them goes to an admin add page with fields prepopulated.

Various other little things, e.g. filled in the footer with links.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8305 by aaron @ 3/16/2009 8:53 AM

1 files changed, 5 insertions, 3 deletions

diff --git a/urls.py b/urls.py
index 21da230..978493f 100644
--- a/urls.py
+++ b/urls.py
@@ -4,7 +4,8 @@ import troggle.settings as settings
 from expo.views import *  # flat import

 from expo.views_caves import *

 from expo.views_survex import *

-

+from expo.models import *

+from django.views.generic.create_update import create_object

 from django.contrib import admin

 admin.autodiscover()

 

@@ -41,7 +42,7 @@ urlpatterns = patterns('',
 

     url(r'^survex/(.*?)\.index$', views_survex.index, name="survexindex"),

     url(r'^cave/(?P<cave_id>[^/]+)/?$', views_caves.cavehref),

-    url(r'^cave/(?P<cave_id>[^/]+)/(?P<year>\d\d\d\d)-(?P<qm_id>\d\d)?$', views_caves.qm),

+    url(r'^cave/(?P<cave_id>[^/]+)/(?P<year>\d\d\d\d)-(?P<qm_id>\d\d)(?P<grade>[ABCDX]?)?$', views_caves.qm, name="qm"),

     (r'^survex/(?P<survex_file>.*)\.svx$', svx),

     (r'^survex/(?P<survex_file>.*)\.3d$', threed),

     (r'^survex/(?P<survex_file>.*)\.log$', log),

@@ -59,7 +60,8 @@ urlpatterns = patterns('',
     url(r'^survey/(?P<year>\d\d\d\d)\#(?P<wallet_number>\d*)$', survey, name="survey"),

     

     (r'^admin/doc/?', include('django.contrib.admindocs.urls')),

-    (r'^admin/(.*)', admin.site.root),

+    

+    url(r'^admin/', include(admin.site.urls),name="admin"),

 

     (r'^accounts/', include('registration.urls')),

     (r'^profiles/', include('profiles.urls')),