Moved models around

3 files changed, 3 insertions, 22 deletions

diff --git a/wiki/models.py b/wiki/models.py
deleted file mode 100644
index 85f0726c..00000000
--- a/wiki/models.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from django.db import models
-from django.contrib.auth.models import User
-
-class Wikipage(models.Model):
-    """Wiki page storage"""
-    title = models.CharField(maxlength=255)
-    content = models.TextField()
-    last_author = models.ForeignKey(User)
-    class Meta:
-        db_table = 'wikipages'
-
-    def editurl(self):
-        return "/wiki/edit/" + self.title + "/"
-
-    def __repr__(self):
-        return self.title
-
-# vim: set ts=4 sw=4 et:
-
diff --git a/wiki/templatetags/wikitags.py b/wiki/templatetags/wikitags.py
index c8c1cd38..da662e8a 100644
--- a/wiki/templatetags/wikitags.py
+++ b/wiki/templatetags/wikitags.py
@@ -1,6 +1,6 @@
 from django.template import Library
 from django.conf import settings
-from archweb_dev.lib import markdown
+from archweb_dev.main import markdown
 import re
 
 register = Library()
diff --git a/wiki/views.py b/wiki/views.py
index 796f5f98..4c9f732f 100644
--- a/wiki/views.py
+++ b/wiki/views.py
@@ -3,8 +3,8 @@
 #
 from django.http import HttpResponse, HttpResponseRedirect
 from django.contrib.auth.decorators import login_required
-from archweb_dev.lib.utils import render_response
-from archweb_dev.wiki.models import Wikipage
+from archweb_dev.main.utils import render_response
+from archweb_dev.main.models import Wikipage
 
 @login_required
 def index(request):