Django 1.7 mostly working. Big refactor so probably bugs

core/admin.py

@@ -4,7 +4,7 @@ from django.forms import ModelForm
 import django.forms as forms
 from django.http import HttpResponse
 from django.core import serializers
-from core.views_other import downloadLogbook
+from troggle.core.views_other import downloadLogbook
 #from troggle.reversion.admin import VersionAdmin #django-reversion version control
 
 
@@ -12,8 +12,8 @@ class TroggleModelAdmin(admin.ModelAdmin):
     
     def save_model(self, request, obj, form, change):
         """overriding admin save to fill the new_since parsing_field"""
-	obj.new_since_parsing=True
-	obj.save()
+        obj.new_since_parsing=True
+        obj.save()
     
     class Media:
         js = ('jquery/jquery.min.js','js/QM_helper.js')

core/context.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from core.models import Expedition
+from troggle.core.models import Expedition
 
 def troggle_context(request):
     return { 'settings':settings, 'Expedition':Expedition }

core/models.py

@@ -15,7 +15,7 @@ from django.template import Context, loader
 import settings
 getcontext().prec=2 #use 2 significant figures for decimal calculations
 
-from models_survex import *
+from troggle.core.models_survex import *
 
 
 def get_related_by_wikilinks(wiki_text):
@@ -55,7 +55,7 @@ class TroggleModel(models.Model):
         return urlparse.urljoin(settings.URL_ROOT, "/admin/core/" + self.object_name().lower() + "/" + str(self.pk))
 
     class Meta:
-	    abstract = True
+        abstract = True
 
 class TroggleImageModel(ImageModel):
     new_since_parsing = models.BooleanField(default=False, editable=False)
@@ -68,7 +68,7 @@ class TroggleImageModel(ImageModel):
 
 
     class Meta:
-	    abstract = True
+        abstract = True
 
 # 
 # single Expedition, usually seen by year
@@ -140,7 +140,7 @@ class Person(TroggleModel):
         return urlparse.urljoin(settings.URL_ROOT,reverse('person',kwargs={'first_name':self.first_name,'last_name':self.last_name}))
 
     class Meta:
-	    verbose_name_plural = "People"
+        verbose_name_plural = "People"
     class Meta:
         ordering = ('orderref',)  # "Wookey" makes too complex for: ('last_name', 'first_name') 
     

core/templatetags/wiki_markup.py

@@ -3,7 +3,7 @@ from django.utils.html import conditional_escape
 from django.template.defaultfilters import stringfilter
 from django.utils.safestring import mark_safe
 from django.conf import settings
-from core.models import QM, DPhoto, LogbookEntry, Cave
+from troggle.core.models import QM, DPhoto, LogbookEntry, Cave
 import re, urlparse
 
 register = template.Library()