Moved classes to models_caves and fixed imports

core/views_logbooks.py

@@ -1,23 +1,27 @@
-from django.shortcuts import render_to_response, render
-from troggle.core.models import Expedition, Person, PersonExpedition, PersonTrip, LogbookEntry, SurvexBlock
-import troggle.core.models as models
-import troggle.settings as settings
+import datetime
+import os.path
+import re
+
 import django.db.models
+from django.core.urlresolvers import reverse
+from django.http import HttpResponse, HttpResponseRedirect
+from django.shortcuts import render, render_to_response
+from django.template import Context, loader
+from django.template.defaultfilters import slugify
+from django.utils import timezone
+from django.views.generic.list import ListView
+
+import troggle.core.models as models
+import troggle.parsers.logbooks as logbookparsers
+from troggle.core.forms import getTripForm  # , get_name, PersonForm
+from troggle.core.models import Expedition, LogbookEntry, Person,                                PersonExpedition, PersonTrip
+from troggle.core.models_survex import SurvexBlock
+from troggle.helper import login_required_if_public
 from troggle.parsers.logbooks import LoadLogbookForExpedition
 from troggle.parsers.people import GetPersonExpeditionNameLookup
-from troggle.core.forms import getTripForm#, get_name, PersonForm
-from  django.core.urlresolvers import reverse
-from django.http import HttpResponseRedirect, HttpResponse
-from django.template import Context, loader
-import os.path
-import troggle.parsers.logbooks as logbookparsers
-from django.template.defaultfilters import slugify
-from troggle.helper import login_required_if_public
-import datetime
-
-from django.views.generic.list import ListView
-from django.utils import timezone
 
+import troggle.settings as settings
+from settings import *
 
 # Django uses Context, not RequestContext when you call render
 # to_response. We always want to use RequestContext, so that
@@ -28,7 +32,6 @@ from django.utils import timezone
 # will make this unnecessary.
 # from troggle.alwaysUseRequestContext import render_response
 
-import re
 
 @django.db.models.permalink #this allows the nice get_absolute_url syntax we are using
 
@@ -162,7 +165,6 @@ def personForm(request,pk):
     form=PersonForm(instance=person)
     return render(request,'personform.html', {'form':form,})
 
-from settings import * 
 def pathsreport(request):
     pathsdict={
     "ADMIN_MEDIA_PREFIX" : ADMIN_MEDIA_PREFIX,