0
@@ -13,37 +13,3 @@ ENTRY_CHOICES = (
0
     ('M', 'Methods'),
0
 )
0
 
0
-class Link(models.Model):
0
-    id = models.IntegerField(db_column="link_id", primary_key=True)
0
-    url = models.URLField(db_column="link_url")
0
-    title = models.CharField(db_column="link_name", max_length=90)
0
-    category = models.IntegerField(max_length=1, choices=LINK_CATEGORIES)
0
-    def __str__(self):
0
-        return self.title
0
-    class Admin:
0
-        list_display = ('title', 'url', 'category')
0
-
0
-class Category(models.Model):
0
-	def __str__(self):
0
-		return self.name
0
-	name = models.CharField(max_length=90)
0
-	nameslug = models.SlugField(prepopulate_from=('name',))
0
-	class Admin:
0
-		pass
0
-	class Meta:
0
-		verbose_name_plural = 'Categories'
0
-
0
-class Post(models.Model):
0
-	def __str__(self):
0
-		return self.title
0
-	post_date = models.DateTimeField(auto_now_add=True)
0
-	title = models.CharField(max_length=255)
0
-	titleslug = models.SlugField(prepopulate_from=('title',))
0
-	type = models.CharField(max_length=1, choices=ENTRY_CHOICES)
0
-	category = models.ManyToManyField(Category)
0
-	excerpt = models.CharField(max_length=255, blank=True)
0
-	contents = models.TextField()
0
-	update_date = models.DateTimeField(auto_now=True, editable=False)
0
-	class Admin:
0
-		list_display = ('title', 'excerpt', 'type', 'post_date', 'update_date')
0
-		search_fields = ['title', 'contents']
0
\ No newline at end of file

0
@@ -0,0 +1 @@
0
+import car.admin
0
\ No newline at end of file

0
@@ -2,10 +2,9 @@ from django.db import models
0
 
0
 class Nation(models.Model):
0
     name = models.CharField(max_length=50)
0
-    nameslug = models.SlugField(prepopulate_from=('name',))
0
-    class Admin:
0
-        pass
0
-    def __str__(self):
0
+    nameslug = models.SlugField()
0
+
0
+    def __unicode__(self):
0
         return self.name
0
     def get_absolute_url(self):
0
         return "/docs/nation/%s/" % self.nameslug
0
@@ -13,43 +12,39 @@ class Nation(models.Model):
0
 class State(models.Model):
0
     abbrev = models.USStateField()
0
     statename = models.CharField(max_length=50)
0
-    class Admin:
0
-        pass
0
-    def __str__(self):
0
+
0
+    def __unicode__(self):
0
         return self.abbrev
0
+    
0
     def get_absolute_url(self):
0
         return "/docs/state/%s/" % self.abbrev.lower()
0
 
0
 class Type(models.Model):
0
     typename = models.CharField(max_length=25)
0
-    typeslug = models.SlugField(prepopulate_from=('typename',))
0
-    class Admin:
0
-        pass
0
-    def __str__(self):
0
+    typeslug = models.SlugField()
0
+
0
+    def __unicode__(self):
0
         return self.typename
0
     def get_absolute_url(self):
0
         return "/docs/type/%s/" % self.typeslug
0
 
0
 class Source(models.Model):
0
     name = models.CharField(max_length=75)
0
-    sourceslug = models.SlugField(prepopulate_from=('name',))
0
+    sourceslug = models.SlugField()
0
     state = models.ForeignKey(State, blank=True, null=True)
0
     nation = models.ForeignKey(Nation)
0
     type = models.ForeignKey(Type)
0
-    class Admin:
0
-        list_display = ('name', 'type', 'nation')
0
-        ordering = ['name']
0
-    def __str__(self):
0
+
0
+    def __unicode__(self):
0
         return self.name
0
     def get_absolute_url(self):
0
         return "/docs/source/%s/" % self.sourceslug
0
 
0
 class Datatype(models.Model):
0
     datatype = models.CharField(max_length=50)
0
-    dataslug = models.SlugField(prepopulate_from=('datatype',))
0
-    class Admin:
0
-        pass
0
-    def __str__(self):
0
+    dataslug = models.SlugField()
0
+
0
+    def __unicode__(self):
0
         return self.datatype
0
     def get_absolute_url(self):
0
         return "/docs/datatype/%s/" % self.dataslug
0
@@ -57,13 +52,11 @@ class Datatype(models.Model):
0
 class Byline(models.Model):
0
     lastname = models.CharField(max_length=75)
0
     firstname = models.CharField(max_length=75)
0
-    nameslug = models.SlugField(prepopulate_from=('firstname', 'lastname'))
0
-    class Admin:
0
-        ordering = ['lastname', 'firstname']
0
-        search_fields = ['lastname']
0
+    nameslug = models.SlugField()
0
+
0
     class Meta:
0
         ordering = ['lastname', 'firstname']
0
-    def __str__(self):
0
+    def __unicode__(self):
0
         return "%s %s" % (self.firstname, self.lastname)
0
     def full_name(self):
0
         return "%s, %s" % (self.lastname, self.firstname)
0
@@ -72,10 +65,9 @@ class Byline(models.Model):
0
 
0
 class Topic(models.Model):
0
     topicname = models.CharField(max_length=50)
0
-    topicslug = models.SlugField(prepopulate_from=('topicname',))
0
-    class Admin:
0
-        pass
0
-    def __str__(self):
0
+    topicslug = models.SlugField()
0
+
0
+    def __unicode__(self):
0
         return self.topicname
0
     def get_absolute_url(self):
0
         return "/docs/topic/%s/" % self.topicslug
0
@@ -85,19 +77,17 @@ class Story(models.Model):
0
     postdate = models.DateField()
0
     source = models.ForeignKey(Source)
0
     url = models.URLField()
0
-    byline = models.ManyToManyField(Byline, filter_interface=models.VERTICAL, blank=True)
0
+    byline = models.ManyToManyField(Byline, blank=True)
0
     headline = models.CharField(max_length=90)
0
-    headslug = models.SlugField(prepopulate_from=('headline',))
0
+    headslug = models.SlugField()
0
     datatype = models.ManyToManyField(Datatype)
0
     topic = models.ManyToManyField(Topic, null=True)
0
     methodology = models.CharField(max_length=90, null=True, blank=True)
0
     dburl = models.URLField(null=True, blank=True)
0
     description = models.TextField()
0
     note = models.TextField(null=True, blank=True)
0
-    class Admin:
0
-        list_display = ('headline', 'source', 'pubdate')
0
-        search_fields = ['headline']
0
-    def __str__(self):
0
+
0
+    def __unicode__(self):
0
         return "%s, %s (%s)" % (self.headline, self.source, self.postdate)
0
     def get_absolute_url(self):
0
         return "/docs/story/%s/" % self.headslug
0
@@ -113,12 +103,9 @@ class Story(models.Model):
0
 
0
 class Application(models.Model):
0
     name = models.CharField(max_length=90)
0
-    slug = models.SlugField(prepopulate_from=('name',))
0
-    
0
-    class Admin:
0
-        pass
0
+    slug = models.SlugField()
0
     
0
-    def __str__(self):
0
+    def __unicode__(self):
0
         return self.name
0
     
0
     def get_absolute_url(self):
0
@@ -129,16 +116,13 @@ class Database(models.Model):
0
     source = models.ForeignKey(Source)
0
     url = models.URLField()
0
     title = models.CharField(max_length=90)
0
-    slug = models.SlugField(prepopulate_from=('title',))
0
-    credit = models.ManyToManyField(Byline, filter_interface=models.VERTICAL, blank=True)
0
+    slug = models.SlugField()
0
+    credit = models.ManyToManyField(Byline, blank=True)
0
     topic = models.ManyToManyField(Topic, null=True)
0
     application = models.ForeignKey(Application)
0
     description = models.TextField()
0
     
0
-    class Admin:
0
-        pass
0
-    
0
-    def __str__(self):
0
+    def __unicode__(self):
0
         return self.title
0
     
0
     def get_absolute_url(self):

0
@@ -1,19 +1,15 @@
0
 from django.db import models
0
 
0
-
0
 class Language(models.Model):
0
     name = models.CharField(max_length=90)
0
-    slug = models.SlugField(prepopulate_from=('name',))
0
+    slug = models.SlugField()
0
     
0
     def __unicode__(self):
0
         return self.name
0
-    
0
-    class Admin:
0
-        pass
0
 
0
 class Project(models.Model):
0
     title = models.CharField(max_length=90)
0
-    slug = models.SlugField(prepopulate_from=('title',))
0
+    slug = models.SlugField()
0
     language = models.ForeignKey(Language)
0
     repository_url = models.CharField(max_length=120, blank=True)
0
     description = models.TextField(blank=True)
0
@@ -22,9 +18,6 @@ class Project(models.Model):
0
     def __unicode__(self):
0
         return self.title
0
     
0
-    class Admin:
0
-        pass
0
-    
0
     def get_absolute_url(self):
0
         return "/code/%s/" % self.slug
0
 
0
@@ -37,32 +30,23 @@ class Update(models.Model):
0
     def __unicode__(self):
0
         return self.title
0
 
0
-    class Admin:
0
-        pass
0
-
0
 class Organization(models.Model):
0
     name = models.CharField(max_length=150)
0
-    slug = models.SlugField(prepopulate_from=('name',))
0
+    slug = models.SlugField()
0
     
0
     def __unicode__(self):
0
         return self.name
0
-    
0
-    class Admin:
0
-        pass
0
 
0
 class Topic(models.Model):
0
     name = models.CharField(max_length=150)
0
-    slug = models.SlugField(prepopulate_from=('name',))
0
+    slug = models.SlugField()
0
     
0
     def __unicode__(self):
0
         return self.name
0
-    
0
-    class Admin:
0
-        pass
0
 
0
 class Presentation(models.Model):
0
     title = models.CharField(max_length=255)
0
-    slug = models.SlugField(prepopulate_from=("title",))
0
+    slug = models.SlugField()
0
     organization = models.ForeignKey(Organization)
0
     topic = models.ForeignKey(Topic)
0
     date = models.DateField()
0
@@ -70,7 +54,4 @@ class Presentation(models.Model):
0
     url = models.URLField(blank=True, null=True)
0
 
0
     def __unicode__(self):
0
-        return self.title
0
-    
0
-    class Admin:
0
-        pass
0
\ No newline at end of file
0
+        return self.title
0
\ No newline at end of file

0
@@ -1,20 +1,15 @@
0
 from django.conf.urls.defaults import *
0
 from django.views.generic import list_detail, date_based, create_update
0
-from thescoop.car.models import Byline, Datatype, Nation, Source, State, Story, Topic, Type
0
-from thescoop.blog.models import Link, Category, Post
0
-from thescoop.projects.models import Language, Project, Update
0
+from thescoop.car.models import Byline, Datatype, Nation, Source, State, Story, Topic, Type, Database, Application
0
+from thescoop.projects.models import Language, Project, Update, Presentation, Topic
0
 from thescoop.feeds import LatestEntries, LatestBylines, LatestSources, TopicFeed, SourceFeed, BylineFeed
0
+from django.contrib import admin
0
 
0
 info_dict = {
0
     'queryset': Story.objects.all().order_by('-pubdate'),
0
     'date_field':'pubdate',
0
 }
0
 
0
-post_dict = {
0
-    'queryset': Post.objects.exclude(category__exact=22).order_by('-post_date'),
0
-    'date_field':'post_date',
0
-}
0
-
0
 byline_list_info = {
0
   'queryset': Byline.objects.all().order_by('lastname'),
0
   'allow_empty': True,
0
@@ -76,5 +71,5 @@ urlpatterns = patterns('',
0
     (r'^docs/feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
0
 
0
     # Uncomment this for admin:
0
-    (r'^admin/', include('django.contrib.admin.urls')),
0
+    (r'^admin/(.*)', admin.site.root),
0
 )