remove old django folder

31 files changed, 0 insertions, 856 deletions

diff --git a/bn_django/journal/__init__.py b/bn_django/journal/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/bn_django/journal/__init__.py
+++ /dev/null
diff --git a/bn_django/journal/admin.py b/bn_django/journal/admin.py
deleted file mode 100644
index 3f1024c..0000000
--- a/bn_django/journal/admin.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from django.contrib import admin
-from bn_django.journal.models import *
-
-class EntryAdmin(admin.ModelAdmin):
-    #fieldsets = (
-        #(None, {
-            #'fields': ('title', 'date', 'html_content', 'author', 'subjournal')
-        #}, ),
-        ##('Advanced options', {
-            #'classes': ('collapse',),
-            #'fields': ('slug',)}))
-    #prepopulated_fields = {'slug': ('title'),'text_content': ('html_content')}
-    #date_hierarchy = 'date'
-    #list_display = ('date', 'title', 'subjournal', 'author')
-    search_fields = ('title','text_content')
-
-class MicroEntryAdmin(admin.ModelAdmin):
-    #fieldsets = (
-        #(None, {
-            #'fields': ('title', 'date', 'html_content', 'author',
-                       #'subjournal',), }),
-        #('Advanced options', {
-            #'classes': ('collapse',),
-            #'fields': ('slug',)}))
-    prepopulated_fields = {'slug': ('title'),'text_content': ('html_content')}
-    date_hierarchy = 'date'
-    list_display = ('date', 'title', 'subjournal', 'author')
-    search_fields = ('title','text_content')
-
-class SubJournalAdmin(admin.ModelAdmin):
-    pass
-
-class LinkArtifactAdmin(admin.ModelAdmin):
-    pass
-
-class CodeAdmin(admin.ModelAdmin):
-    pass
-
-class VideoAdmin(admin.ModelAdmin):
-    pass
-
-class ImageAdmin(admin.ModelAdmin):
-    pass
-
-admin.site.register(Entry,EntryAdmin)
-admin.site.register(MicroEntry,EntryAdmin)
-admin.site.register(SubJournal)
-admin.site.register(LinkArtifact)
-admin.site.register(CodeArtifact)
-admin.site.register(VideoArtifact)
-admin.site.register(ImageArtifact)
diff --git a/bn_django/journal/artifact_urls.py b/bn_django/journal/artifact_urls.py
deleted file mode 100644
index 9a3bde4..0000000
--- a/bn_django/journal/artifact_urls.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from django.conf.urls.defaults import *
-from django.conf import settings
-
-from models import Artifact, VideoArtifact, ImageArtifact, LinkArtifact, CodeArtifact
-
-urlpatterns = patterns('django.views.generic.list_detail',
-	(r'^images/$', 'object_list',
-		dict(queryset=ImageArtifact.objects.order_by('-date'),
-        paginate_by=35, allow_empty=False)),
-	(r'^images/(?P<object_id>\d+)/$', 'object_detail',
-		dict(queryset=ImageArtifact.objects.all())),
-	(r'^links/$', 'object_list',
-		dict(queryset=LinkArtifact.objects.order_by('-date'),
-        paginate_by=35, allow_empty=False)),
-	(r'^links/(?P<object_id>\d+)/$', 'object_detail',
-		dict(queryset=LinkArtifact.objects.all())),
-	(r'^code/$', 'object_list',
-		dict(queryset=CodeArtifact.objects.order_by('-date'),
-        paginate_by=35, allow_empty=False)),
-	(r'^code/(?P<object_id>\d+)/$', 'object_detail',
-		dict(queryset=CodeArtifact.objects.all())),
-	(r'^videos/$', 'object_list',
-		dict(queryset=VideoArtifact.objects.order_by('-date'),
-        paginate_by=35, allow_empty=False)),
-	(r'^videos/(?P<object_id>\d+)/$', 'object_detail',
-		dict(queryset=VideoArtifact.objects.all())),
-)
diff --git a/bn_django/journal/feeds.py b/bn_django/journal/feeds.py
deleted file mode 100644
index 09f1a4e..0000000
--- a/bn_django/journal/feeds.py
+++ /dev/null
@@ -1,67 +0,0 @@
-from django.contrib.syndication.feeds import Feed
-from models import Entry, MicroEntry, LinkArtifact
-
-
-class LatestEntries(Feed):
-    title = "bnewbold.net journal entries"
-    link = "/journal/entries/"
-    description = " "
-
-    def items(self):
-        return Entry.objects.order_by('-date')[:5]
-
-    def item_link(self,item):
-        return "http://bnewbold.net%s" % item.get_absolute_url()
-
-    def item_author_name(self,item):
-        return item.author.username
-
-    def item_author_email(self,item):
-        return item.author.email
-
-    def item_pubdate(self,item):
-        return item.date
-
-class LatestMicroEntries(Feed):
-    title = "bnewbold.net microentries"
-    link = "/journal/microentries/"
-    description = "Quick updates"
-
-    def items(self):
-        return MicroEntry.objects.order_by('-date')[:5]
-
-    def item_link(self,item):
-        return "http://bnewbold.net%s" % item.get_absolute_url()
-
-    def item_author_name(self,item):
-        return item.author.username
-
-    def item_author_email(self,item):
-        return item.author.email
-
-    def item_pubdate(self,item):
-        return item.date
-
-class LatestLinks(Feed):
-    title = "bnewbold.net links"
-    link = "/artifacts/links/"
-    description = "Links to love"
-
-    def items(self):
-        return LinkArtifact.objects.order_by('-date')[:5]
-
-    def item_link(self,item):
-        return item.url
-
-    def item_author_name(self,item):
-        return item.author.username
-
-    def item_author_email(self,item):
-        return item.author.email
-
-    def item_pubdate(self,item):
-        return item.date
-
-feed_list = {'latest_entries':LatestEntries,
-             'latest_microentries':LatestMicroEntries,
-             'latest_links':LatestLinks }
diff --git a/bn_django/journal/models.py b/bn_django/journal/models.py
deleted file mode 100644
index a4402b2..0000000
--- a/bn_django/journal/models.py
+++ /dev/null
@@ -1,98 +0,0 @@
-from django.db import models
-from django.dispatch import dispatcher
-from django.db.models import signals
-from django.contrib.auth.models import User, AnonymousUser
-from bn_django.photos.models import Photo
-
-class SubJournal(models.Model):
-    name = models.CharField("full title", blank=False,max_length=196)
-    date = models.DateField("date started", auto_now_add=True)
-    slug = models.SlugField()
-    description = models.TextField("description of content",blank=True)
-
-    def __unicode__(self):
-        return self.name
-
-    class Meta:
-        get_latest_by = 'date'
-        ordering = ['-date']
-
-class JournalCommon(models.Model):
-    author = User("User who created this") 
-    date = models.DateTimeField("associated day", auto_now=True)
-    last_edited = models.DateTimeField("day last edited", auto_now_add=True)
-    subjournal = models.ForeignKey(SubJournal,blank=True,null=True)
-    defunct = models.BooleanField("is this entry all around done with?",default=False,blank=False)
-    private = models.BooleanField("is this entry for validated users only?",default=False,blank=False)
-
-    class Meta:
-        abstract = True
-        get_latest_by = 'date'
-        ordering = ['-date']
-
-class Entry(JournalCommon):
-    html_content = models.TextField("html format content", blank=False)
-    title = models.CharField("entry title", max_length=384)
-    slug = models.SlugField()
-
-    def __unicode__(self):
-        return self.title
-
-    def get_absolute_url(self):
-        #return "/journal/entries/%04d/%02d/%02d/%s/"%(self.date.year, self.date.month, self.date.day, self.slug)
-        return "/journal/entries/%s/"%self.slug
-
-class MicroEntry(JournalCommon):
-    html_content = models.TextField("html format content", blank=False)
-    text_content = models.TextField("text version of content", blank=True,null=True)
-
-    def __unicode__(self):
-        return self.html_content[:50]
-        
-    def get_absolute_url(self):
-        return "/journal/microentries/%s/"%self.id
-        #return "/journal/microentries/%04d/%02d/%02d/%s/"%(self.date.year, self.date.month, self.date.day, self.slug)
-
-class Artifact(JournalCommon):
-    html_caption = models.TextField("html format caption", blank=True)
-    text_caption = models.TextField("text format caption", blank=True)
-    entry = models.ForeignKey(Entry, blank=True, null=True)
-    title = models.CharField("title of the artifact", max_length=256, blank=True)
-
-    class Meta:
-        abstract = True
-
-class VideoArtifact(Artifact):
-    codec = models.CharField("what codec/format the video is", max_length=384)
-    filepath = models.FileField(upload_to="artifacts/%Y/%m/")
-    external_url = models.URLField("external representation to reduce bandwidth (youtube, etc)", blank=True)
-
-class CodeArtifact(Artifact):
-    code = models.TextField("raw source code", blank=False)
-    language = models.CharField("what programming language", max_length=160, \
-        blank=True)
-
-class LinkArtifact(Artifact):
-    url = models.URLField("external link to something wonderful!",verify_exists=False)
-
-    def __unicode__(self):
-        return self.title
-
-    def get_absolute_url(self):
-        return "/artifacts/links/%s/"% self.id
-
-class ImageArtifact(Artifact,Photo):
-    """Multiply inherets from the photo app
-    """
-
-def build_display_images(sender, instance, signal, *args, **kwargs):
-    """Simple hook for save-after trigger
-    """
-    instance.build_display_images()
-def delete_thumbnails(sender, instance, signal, *args, **kwargs):
-    """Simple hook for pre-delete trigger.
-    """
-    instance.delete_thumbnails()
-
-signals.post_save.connect(build_display_images, sender=ImageArtifact)
-signals.pre_delete.connect(delete_thumbnails, sender=ImageArtifact)
diff --git a/bn_django/journal/templates/feeds/latest_entries_description.html b/bn_django/journal/templates/feeds/latest_entries_description.html
deleted file mode 100644
index 6f28865..0000000
--- a/bn_django/journal/templates/feeds/latest_entries_description.html
+++ /dev/null
@@ -1 +0,0 @@
-{{obj.html_content|safe|truncatewords_html:300}}
diff --git a/bn_django/journal/templates/feeds/latest_entries_title.html b/bn_django/journal/templates/feeds/latest_entries_title.html
deleted file mode 100644
index e12d8e1..0000000
--- a/bn_django/journal/templates/feeds/latest_entries_title.html
+++ /dev/null
@@ -1 +0,0 @@
-{{obj.title|safe}}
diff --git a/bn_django/journal/templates/feeds/latest_links_description.html b/bn_django/journal/templates/feeds/latest_links_description.html
deleted file mode 100644
index 32c8857..0000000
--- a/bn_django/journal/templates/feeds/latest_links_description.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ obj.html_caption|safe|truncatewords_html:200}}
diff --git a/bn_django/journal/templates/feeds/latest_links_title.html b/bn_django/journal/templates/feeds/latest_links_title.html
deleted file mode 100644
index d355de5..0000000
--- a/bn_django/journal/templates/feeds/latest_links_title.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ obj.title }}
diff --git a/bn_django/journal/templates/feeds/latest_microentries_description.html b/bn_django/journal/templates/feeds/latest_microentries_description.html
deleted file mode 100644
index 427823d..0000000
--- a/bn_django/journal/templates/feeds/latest_microentries_description.html
+++ /dev/null
@@ -1 +0,0 @@
-{{obj.html_content|safe|truncatewords_html:160}}
diff --git a/bn_django/journal/templates/feeds/latest_microentries_title.html b/bn_django/journal/templates/feeds/latest_microentries_title.html
deleted file mode 100644
index d992ff6..0000000
--- a/bn_django/journal/templates/feeds/latest_microentries_title.html
+++ /dev/null
@@ -1 +0,0 @@
-{{obj.title}}
diff --git a/bn_django/journal/templates/journal/artifacts.html b/bn_django/journal/templates/journal/artifacts.html
deleted file mode 100644
index 4b82573..0000000
--- a/bn_django/journal/templates/journal/artifacts.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Artifacts!{% endblock %}
-
-{% block content %}<br />
-Oh golly oh golly! We've got
-<b>
-<ul>
- <li /><a href="links/">links</a>
- <li /><a href="images/">images</a>
- <li /><a href="code/">code snippets</a>
- <li /><a href="videos/">videos</a>
-</ul>
-</b>
-Also check out journal <a href="/journal/entries/">entries</a> and <a href="/journal/microentries/">microentries</a>.
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/base.html b/bn_django/journal/templates/journal/base.html
deleted file mode 100644
index 819b1f4..0000000
--- a/bn_django/journal/templates/journal/base.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "base.html" %}
-
-{% block path %}
-    <a href="/journal/">journal</a> 
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/codeartifact_detail.html b/bn_django/journal/templates/journal/codeartifact_detail.html
deleted file mode 100644
index fefdea8..0000000
--- a/bn_django/journal/templates/journal/codeartifact_detail.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% extends "journal/base.html" %}
-{# {% load markup %} #}
-{% load comments %}
-{% block path %}<a href="/artifacts/">artifacts</a> 
-  &raquo;<a href="/artifacts/code/"> code</a>
-  &raquo;<a href="../{{ object.id }}"> {{ object.title }}</a>
-{% endblock %}
-
-{% block title %} 
-{% if object.title %}{{ object.title }}{% else %}[Untitled Code Snippet]{% endif %}
-{% endblock %}
-
-{% block content %}<br />
-{% if object %}<div class="right_stuff">
-<p class="date">Code added {{ object.date }}, 
-{% if object.author %}<br />by {{ object.author }},{% endif %}
-{% if object.last_edited %}<br />last edited {{ object.last_edited }}.{% endif %}
-</div>
-{% if object.language %}This is in {{object.language}}.<br /><br />{%endif%}
-<pre class="large">
-{{object.code}}
-</pre>
-{% if object.html_caption|safe %}<br /><br />{{object.html_caption}}{% endif %}
-{% else %}
-<p>This is not the artifact you are looking for.</p>
-{% endif %}
-{% endblock %}
-
-{% block commentary %}
-<div class='content' id='commentary'>
-{% get_comment_list for object as comments %}
-{% include "comment_list" %}
-<h3>Post a comment</h3>
-{% render_comment_form for object %}
-</div>
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/codeartifact_list.html b/bn_django/journal/templates/journal/codeartifact_list.html
deleted file mode 100644
index ee52afd..0000000
--- a/bn_django/journal/templates/journal/codeartifact_list.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "journal/base.html" %}
-
-{% block path %}<a href="/artifacts/">artifacts</a>
-  &raquo;<a href="/artifacts/code/"> code</a>
-{% endblock %}
-
-{% block title %}Code Snippets{% endblock %}
-
-{% block content %}
-<br />
-{% if object_list %}
-<ul>
-  {% for item in object_list %}
-  <li /><a href="{{ item.id }}/">{{item.title}}</a>
-        {% if item.language %} ({{item.language}}){% endif %}
-  {% endfor %}
-</ul>
-{% else %}
-<p>No code snippets have been uploaded yet.</p>
-{% endif %}
-
-{% if is_paginated %} {% if has_previous %}
-<a href="./?page={{ previous }}">&laquo; previous</a> |
-{% endif %} {% if has_next %}
-<a href="./?page={{ next }}">next &raquo;</a>
-{% endif %} {% endif %}
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/entry_archive_month.html b/bn_django/journal/templates/journal/entry_archive_month.html
deleted file mode 100644
index a9e72da..0000000
--- a/bn_django/journal/templates/journal/entry_archive_month.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "journal/base.html" %}
-{% load comments %}
-
-{% block title %}Journal Entries{% endblock %}
-
-{% block content %}
-<br />
-<div class="notice">
-This page has an <a href="/journal/entries/rss.xml">RSS feed</a>.
-<br />
-See also <a href="/artifacts/">artifacts</a>, <a href="microentries">
-microentries</a>.
-
-</div>
-{% if object_list %}
-  {% for item in object_list %}
-  {% get_comment_count for item as comment_count %}
-  <h3><a href="{{ item.get_absolute_url }}">
-  {% if item.title %}{{item.title}}{%else%}[Untitled]{%endif%}</a></h3>
-  <i>{{item.date|date:"D, d/m/Y @H:i"}} by {{ item.author.username }}. 
-  <a href="{{ item.get_absolute_url }}#commentary">{{ comment_count }} comments</a></i>
-  <p style="padding-left:30px">
-  {{ item.html_content|truncatewords_html:256 }}
-  </p>
-  {% endfor %}
-{% else %}
-<p>No entries have been entered yet!</p>
-{% endif %}
-
-{% if is_paginated %} {% if has_previous %}
-<a href="./?page={{ previous }}">&laquo; previous</a> |
-{% endif %} {% if has_next %}
-<a href="./?page={{ next }}">next &raquo;</a>
-{% endif %} {% endif %}
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/entry_archive_year.html b/bn_django/journal/templates/journal/entry_archive_year.html
deleted file mode 100644
index a9e72da..0000000
--- a/bn_django/journal/templates/journal/entry_archive_year.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "journal/base.html" %}
-{% load comments %}
-
-{% block title %}Journal Entries{% endblock %}
-
-{% block content %}
-<br />
-<div class="notice">
-This page has an <a href="/journal/entries/rss.xml">RSS feed</a>.
-<br />
-See also <a href="/artifacts/">artifacts</a>, <a href="microentries">
-microentries</a>.
-
-</div>
-{% if object_list %}
-  {% for item in object_list %}
-  {% get_comment_count for item as comment_count %}
-  <h3><a href="{{ item.get_absolute_url }}">
-  {% if item.title %}{{item.title}}{%else%}[Untitled]{%endif%}</a></h3>
-  <i>{{item.date|date:"D, d/m/Y @H:i"}} by {{ item.author.username }}. 
-  <a href="{{ item.get_absolute_url }}#commentary">{{ comment_count }} comments</a></i>
-  <p style="padding-left:30px">
-  {{ item.html_content|truncatewords_html:256 }}
-  </p>
-  {% endfor %}
-{% else %}
-<p>No entries have been entered yet!</p>
-{% endif %}
-
-{% if is_paginated %} {% if has_previous %}
-<a href="./?page={{ previous }}">&laquo; previous</a> |
-{% endif %} {% if has_next %}
-<a href="./?page={{ next }}">next &raquo;</a>
-{% endif %} {% endif %}
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/entry_detail.html b/bn_django/journal/templates/journal/entry_detail.html
deleted file mode 100644
index b68e4b6..0000000
--- a/bn_django/journal/templates/journal/entry_detail.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "journal/base.html" %}
-{% load comments %}
-
-{% block path %}{{ block.super }}
-  &raquo;<a href="{{object.get_absolute_url}}"> {{ object.title }}</a>
-{% endblock %}
-
-{% block title %} 
-{% if object.title %}{{ object.title }}{% else %}[Untitled Entry]{% endif %}
-{% endblock %}
-
-{% block content %}<br />
-{% if object %}<div class="right_stuff">
-<p class="date">Entry dated {{ object.date }}, 
-{% if object.author %}<br />written by {{ object.author }},{% endif %}
-{% if object.last_edited %}<br />last edited {{ object.last_edited }}.{% endif %}
-</div>
-<p class="journal_entry">{{ object.html_content|safe }}</p>
-{% else %}
-<p>This is not the entry you are looking for.</p>
-{% endif %}
-{% endblock %}
-
-{% block commentary %}
-<div class='content' id='commentary'>
-{% get_comment_list for object as comments %}
-{% include "comment_list" %}
-<h3>Post a comment</h3>
-{% render_comment_form for object %}
-</div>
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/entry_list.html b/bn_django/journal/templates/journal/entry_list.html
deleted file mode 100644
index 8902552..0000000
--- a/bn_django/journal/templates/journal/entry_list.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "journal/base.html" %}
-{% load comments %}
-
-{% block title %}Journal Entries{% endblock %}
-
-{% block otherhead %}{{ block.super}}
-<link rel="alternate" type="application/rss+xml" title="RSS" href="/journal/rss/latest_entries/">
-{% endblock %}
-
-{% block content %}
-<br />
-<div class="notice">
-This page has an <a href="/journal/rss/latest_entries/">RSS feed</a>.
-<br />
-See also <a href="/artifacts/">artifacts</a>, <a href="microentries">
-microentries</a>.
-
-</div>
-{% if object_list %}
-  {% for item in object_list %}
-  {% get_comment_count for item as comment_count %}
-  <h3><a href="{{ item.get_absolute_url }}">
-  {% if item.title %}{{item.title}}{%else%}[Untitled]{%endif%}</a></h3>
-  <i>{{item.date|date:"D, d/m/Y @H:i"}} by {{ item.author.username }}. 
-  <a href="{{ item.get_absolute_url }}#commentary">{{ comment_count }} comments</a></i>
-  <p style="padding-left:30px">
-  {{ item.html_content|truncatewords_html:256 }}
-  </p>
-  {% endfor %}
-{% else %}
-<p>No entries have been entered yet!</p>
-{% endif %}
-
-{% if is_paginated %} {% if has_previous %}
-<a href="./?page={{ previous }}">&laquo; previous</a> |
-{% endif %} {% if has_next %}
-<a href="./?page={{ next }}">next &raquo;</a>
-{% endif %} {% endif %}
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/imageartifact_detail.html b/bn_django/journal/templates/journal/imageartifact_detail.html
deleted file mode 100644
index 45ea1aa..0000000
--- a/bn_django/journal/templates/journal/imageartifact_detail.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends "journal/base.html" %}
-{# {% load markup %} #}
-{% load comments %}
-{% block path %}<a href="/artifacts/">artifacts</a> 
-  &raquo;<a href="/artifacts/images/"> images</a>
-  &raquo;<a href="../{{ object.id }}"> {{ object.title }}</a>
-{% endblock %}
-
-{% block title %} 
-{% if object.title %}{{ object.title }}{% else %}[Untitled Image]{% endif %}
-{% endblock %}
-
-{% block content %}<br />
-{% if object %}<div class="right_stuff">
-<p class="date">Image uploaded {{ object.date }}, 
-{% if object.author %}<br />by {{ object.author }},{% endif %}
-{% if object.last_edited %}<br />last edited {{ object.last_edited }}.{% endif %}
-</div>
-<center>
-<div id="centerize">
-  <a href="{{ object.fullurl }}">
-    <img src="{{ object.dispurl }}"
-         alt="{{ object.title }}" />
-  </a>
-</div>
-</center>
-{% if object.html_caption %}<br /><br />{{object.html_caption}}{% endif %}
-{% else %}
-<p>This is not the artifact you are looking for.</p>
-{% endif %}
-{% endblock %}
-
-{% block commentary %}
-<div class='content' id='commentary'>
-{% get_comment_list for object as comments %}
-{% include "comment_list" %}
-<h3>Post a comment</h3>
-{% render_comment_form for object %}
-</div>
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/imageartifact_list.html b/bn_django/journal/templates/journal/imageartifact_list.html
deleted file mode 100644
index 6530773..0000000
--- a/bn_django/journal/templates/journal/imageartifact_list.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends "journal/base.html" %}
-
-{% block path %}<a href="/artifacts/">artifacts</a> 
-  &raquo;<a href="/artifacts/images"> images</a>{% endblock %}
-
-{% block title %}Uploaded Images{% endblock %}
-
-{% block content %}
-<br />
-{% if object_list %}
-<table width="100%" class="thumbs">
-{% for item in object_list %} {% cycle <tr/>,&nbsp;,&nbsp;,&nbsp; %}
-    <td class="photo_thumb">
-    <a href="{{ item.id }}/">
-    <img src="{{ item.thumburl }}"
-        alt="{{ item.title }}" />
-    </td> {% endfor %}
-</table>
-{% else %}
-<p>There are no images!  If you just uploaded a batch
-of photos, try hitting your browser's reload button to see if they
-show up.</p> {% endif %}
-
-{% if is_paginated %} {% if has_previous %}
-<a href="./?page={{ previous }}">&laquo; previous</a> |
-{% endif %} {% if has_next %}
-<a href="./?page={{ next }}">next &raquo;</a>
-{% endif %} {% endif %}
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/linkartifact_detail.html b/bn_django/journal/templates/journal/linkartifact_detail.html
deleted file mode 100644
index 70f9656..0000000
--- a/bn_django/journal/templates/journal/linkartifact_detail.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "journal/base.html" %}
-
-{% load comments %}
-
-{% block path %}<a href="/artifacts/">artifacts</a> 
-  &raquo;<a href="/artifacts/links/"> links</a>
-  &raquo;<a href="../{{ object.id }}"> {{ object.title }}</a>
-{% endblock %}
-
-{% block title %} 
-{% if object.title %}{{ object.title }}{% else %}[Untitled Link]{% endif %}
-{% endblock %}
-
-{% block content %}<br />
-{% if object %}<div class="right_stuff">
-<p class="date">Link created {{ object.date }}, 
-{% if object.author %}<br />by {{ object.author }},{% endif %}
-{% if object.last_edited %}<br />last edited {{ object.last_edited }}.{% endif %}
-</div>
-<b><a href="{{object.url}}">{{object.url}}</a></b>
-{% if object.html_caption %}<br /><br /> {{object.html_caption|safe}}{% endif %}
-{% else %}
-<p>This is not the artifact you are looking for.</p>
-{% endif %}
-{% endblock %}
-
-{% block commentary %}
-<div class='content' id='commentary'>
-{% get_comment_list for object as comments %}
-{% include "comment_list" %}
-<h3>Post a comment</h3>
-{% render_comment_form for object %}
-</div>
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/linkartifact_list.html b/bn_django/journal/templates/journal/linkartifact_list.html
deleted file mode 100644
index 136ce72..0000000
--- a/bn_django/journal/templates/journal/linkartifact_list.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "journal/base.html" %}
-
-{% block otherhead %}{{ block.super}}
-<link rel="alternate" type="application/rss+xml" title="RSS" href="/journal/rss/latest_links/">
-{% endblock %}
-
-{% block path %}<a href="/artifacts/">artifacts</a>
-  &raquo;<a href="/artifacts/links/"> links</a>
-{% endblock %}
-
-{% block title %}Links Galore!{% endblock %}
-{% block right_stuff %}
-This page has an <a href="/journal/rss/latest_links/">RSS feed</a>.
-{%endblock %}
-
-{% block content %}
-New favorite finds from the net. Good posts from 
-<a href="/oldlinks">RSS feeds</a>
-end up at <a href="http://feeds.bnewbold.net">feeds.bnewbold.net</a>.
-<br />
-<br />
-{% if object_list %}
-<ul style="list-style: none;margin-left:10px;">
-  {% for item in object_list %}
-  <li style="margin-bottom: 8px;"/><a href="{{ item.id }}/" style="font-size:140%;">{{item.title}}</a> 
-    {% if item.html_caption %}
-      &nbsp;"{{item.html_caption|safe|truncatewords_html:10}}"{%endif%}
-    <br /><i style="padding-left: 15px; font-size:90%;">
-    added {{item.date|date:"D, M d, Y"}} - 
-    <a href="{{ item.id }}/">more info</a> - 
-    {{ item.url|urlizetrunc:70 }}</i>
-  {% endfor %}
-</ul>
-{% else %}
-<p>No links have been entered yet.</p>
-{% endif %}
-
-{% if is_paginated %} {% if has_previous %}
-<a href="./?page={{ previous }}">&laquo; previous</a> |
-{% endif %} {% if has_next %}
-<a href="./?page={{ next }}">next &raquo;</a>
-{% endif %} {% endif %}
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/microentry_arhive_month.html b/bn_django/journal/templates/journal/microentry_arhive_month.html
deleted file mode 100644
index eca642d..0000000
--- a/bn_django/journal/templates/journal/microentry_arhive_month.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "journal/base.html" %}
-{% load comments %}
-
-{% block path %}{{block.super}}
-  &raquo;<a href="/journal/microentries/"> microentries</a>
-
-{% block title %}Journal Microentries{% endblock %}
-
-{% block content %}
-<br />
-{% if object_list %}
-  {% for item in object_list %}
-  <b>{{item.date|date:"D, d/m/Y @H:i"}}:
-  <a href="{{ item.get_absolute_url }}">
-  {% if item.title %}{{item.title}}{%else%}[Untitled]{%endif%}</a></b>
-  <p style="padding-left:30px">
-  {{ item.html_content|truncatewords_html:256 }}
-  {% get_comment_count for item as comment_count %}
-  (<a href="{{ item.get_absolute_url }}#commentary">{{ comment_count }} comments</a>)
-  </p>
-  {% endfor %}
-{% else %}
-<p>No entries have been entered yet!</p>
-{% endif %}
-
-{% if is_paginated %} {% if has_previous %}
-<a href="./?page={{ previous }}">&laquo; previous</a> |
-{% endif %} {% if has_next %}
-<a href="./?page={{ next }}">next &raquo;</a>
-{% endif %} {% endif %}
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/microentry_arhive_year.html b/bn_django/journal/templates/journal/microentry_arhive_year.html
deleted file mode 100644
index eca642d..0000000
--- a/bn_django/journal/templates/journal/microentry_arhive_year.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "journal/base.html" %}
-{% load comments %}
-
-{% block path %}{{block.super}}
-  &raquo;<a href="/journal/microentries/"> microentries</a>
-
-{% block title %}Journal Microentries{% endblock %}
-
-{% block content %}
-<br />
-{% if object_list %}
-  {% for item in object_list %}
-  <b>{{item.date|date:"D, d/m/Y @H:i"}}:
-  <a href="{{ item.get_absolute_url }}">
-  {% if item.title %}{{item.title}}{%else%}[Untitled]{%endif%}</a></b>
-  <p style="padding-left:30px">
-  {{ item.html_content|truncatewords_html:256 }}
-  {% get_comment_count for item as comment_count %}
-  (<a href="{{ item.get_absolute_url }}#commentary">{{ comment_count }} comments</a>)
-  </p>
-  {% endfor %}
-{% else %}
-<p>No entries have been entered yet!</p>
-{% endif %}
-
-{% if is_paginated %} {% if has_previous %}
-<a href="./?page={{ previous }}">&laquo; previous</a> |
-{% endif %} {% if has_next %}
-<a href="./?page={{ next }}">next &raquo;</a>
-{% endif %} {% endif %}
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/microentry_detail.html b/bn_django/journal/templates/journal/microentry_detail.html
deleted file mode 100644
index 245fe32..0000000
--- a/bn_django/journal/templates/journal/microentry_detail.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% extends "journal/base.html" %}
-
-{% load comments %}
-{% block path %}{{ block.super }}
-  &raquo;<a href="/journal/microentries/"> microentries</a> 
-  &raquo;<a href="{{ item.get_absolute_url }}"> {{ object.title }}</a>
-{% endblock %}
-
-{% block title %} 
-{% if object.title %}{{ object.title }}{% else %}[Untitled Microentry]{% endif %}
-{% endblock %}
-
-{% block content %}<br />
-{% if object %}<div class="right_stuff">
-<p class="date">dated {{ object.date }}, 
-{% if object.author %}<br />written by {{ object.author.username }},{% endif %}
-{% if object.last_edited %}<br />last edited {{ object.last_edited }}.{% endif %}
-</div>
-<p class="journal_entry">{{ object.html_content|safe }}</p>
-{% else %}
-<p>This is not the entry you are looking for.</p>
-{% endif %}
-{% endblock %}
-
-{% block commentary %}
-<div class='content' id='commentary'>
-{% get_comment_list for object as comments %}
-{% include "comment_list" %}
-<h3>Post a comment</h3>
-{% render_comment_form for object %}
-</div>
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/microentry_list.html b/bn_django/journal/templates/journal/microentry_list.html
deleted file mode 100644
index 25255f6..0000000
--- a/bn_django/journal/templates/journal/microentry_list.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "journal/base.html" %}
-{% load comments %}
-
-{% block otherhead %}{{ block.super}}
-<link rel="alternate" type="application/rss+xml" title="RSS" href="/journal/rss/latest_microentries/">
-{% endblock %}
-
-{% block path %}{{block.super}}
-  &raquo;<a href="/journal/microentries/"> microentries</a>{% endblock %}
-
-{% block title %}Journal Microentries{% endblock %}
-
-{% block content %}
-<br />
-<div class="notice">
-This page has an <a href="/journal/rss/latest_microentries/">RSS feed</a>.
-</div>
-
-{% if object_list %}
-  {% for item in object_list %}
-  <b>{{item.date|date:"D, m/d/Y @H:i"}}:
-  {% if item.title %}
-  <a href="{{ item.get_absolute_url }}"> {{item.title}}</a>{%endif%}</b>
-  <p style="padding-left:30px">
-  {{ item.html_content|truncatewords_html:256 }}
-  {% get_comment_count for item as comment_count %}
-  (<a href="{{ item.get_absolute_url }}#commentary">{{ comment_count }} comments</a>, <a href="{{ item.get_absolute_url }}">link</a>)
-  </p>
-  {% endfor %}
-{% else %}
-<p>No microentries have been entered yet!</p>
-{% endif %}
-
-{% if is_paginated %} {% if has_previous %}
-<a href="./?page={{ previous }}">&laquo; previous</a> |
-{% endif %} {% if has_next %}
-<a href="./?page={{ next }}">next &raquo;</a>
-{% endif %} {% endif %}
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/videoartifact_detail.html b/bn_django/journal/templates/journal/videoartifact_detail.html
deleted file mode 100644
index 09b0ac2..0000000
--- a/bn_django/journal/templates/journal/videoartifact_detail.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "journal/base.html" %}
-
-{% load comments %}
-{% block path %}<a href="/artifacts/">artifacts</a> 
-  &raquo;<a href="/artifacts/videos/"> videos</a>
-  &raquo;<a href="../{{ object.id }}"> {{ object.title }}</a>
-{% endblock %}
-
-{% block title %} 
-{% if object.title %}{{ object.title }}{% else %}[Untitled Video]{% endif %}
-{% endblock %}
-
-{% block content %}<br />
-{% if object %}<div class="right_stuff">
-<p class="date">Video uploaded {{ object.date }}, 
-{% if object.author %}<br />by {{ object.author }},{% endif %}
-{% if object.last_edited %}<br />last edited {{ object.last_edited }}.{% endif %}
-</div>
-{% if object.external_url %}View this video <a href="{{object.external_url}}">here</a><br /><br />{%endif%}
-<a href="{{object.filepath}}">Download the video.</a>
-<br /><br />The video codec is {{ object.codec }}.<br />
-{% if object.html_caption %}<br /><br />{{object.html_caption|safe}}{% endif %}
-{% else %}
-<p>This is not the artifact you are looking for.</p>
-{% endif %}
-{% endblock %}
-
-{% block commentary %}
-<div class='content' id='commentary'>
-{% get_comment_list for object as comments %}
-{% include "comment_list" %}
-<h3>Post a comment</h3>
-{% render_comment_form for object %}
-</div>
-{% endblock %}
diff --git a/bn_django/journal/templates/journal/videoartifact_list.html b/bn_django/journal/templates/journal/videoartifact_list.html
deleted file mode 100644
index b5af050..0000000
--- a/bn_django/journal/templates/journal/videoartifact_list.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "journal/base.html" %}
-
-{% block path %}<a href="/artifacts/">artifacts</a>
-    &raquo;<a href="/artifacts/videos/"> videos</a>
-{% endblock %}
-
-{% block title %}Videos{% endblock %}
-
-{% block content %}
-<br />
-{% if object_list %}
-<ul>
-  {% for item in object_list %}
-  <li /><a href="{{ item.id }}/">{{item.title}}</a>
-        {%if item.codec%} (codec: {{item.codec}}){% endif %} 
-  {% endfor %}
-</ul>
-{% else %}
-<p>No videos have been entered yet.</p>
-{% endif %}
-
-{% if is_paginated %} {% if has_previous %}
-<a href="./?page={{ previous }}">&laquo; previous</a> |
-{% endif %} {% if has_next %}
-<a href="./?page={{ next }}">next &raquo;</a>
-{% endif %} {% endif %}
-{% endblock %}
diff --git a/bn_django/journal/urls.py b/bn_django/journal/urls.py
deleted file mode 100644
index 4b50f40..0000000
--- a/bn_django/journal/urls.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from django.conf.urls.defaults import *
-from django.conf import settings
-
-from models import Entry, MicroEntry
-from feeds import feed_list
-
-urlpatterns = patterns('django.views.generic.list_detail',
-	(r'^$', 'object_list',
-		dict(queryset=Entry.objects.order_by('-date'),
-        paginate_by=35, allow_empty=False)),
-	(r'^entries/$', 'object_list',
-		dict(queryset=Entry.objects.order_by('-date'),
-        paginate_by=35, allow_empty=False)),
-	(r'^microentries/$', 'object_list',
-		dict(queryset=MicroEntry.objects.order_by('-date'),
-        paginate_by=35, allow_empty=False)),
-	(r'^microentries/(?P<object_id>\d+)/$', 'object_detail',
-		dict(queryset=Entry.objects.order_by('-date'))),
-	(r'^entries/(?P<slug>[\d\w-]+)/$', 'object_detail',
-		dict(queryset=Entry.objects.order_by('-date'))),
-)
-
-urlpatterns += patterns('',
-    (r'^rss/(?P<url>.*)/$','django.contrib.syndication.views.feed',
-        {'feed_dict':feed_list})
-)
-
-#urlpatterns += patterns('django.views.generic.date_based',
-	#(r'^entries/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/(?P<slug>[\d\w-]+)/$', 'object_detail',
-		#dict(queryset=Entry.objects.all(), date_field='date')),
-	#(r'^entries/(?P<year>\d{4})/(?P<month>\d{2})/$', 'archive_month',
-		#dict(queryset=Entry.objects.all(), date_field='date')),
-	#(r'^entries/(?P<year>\d{4})/$', 'archive_year',
-		#dict(queryset=Entry.objects.all(), date_field='date')),
-	#(r'^microentries/(?P<year>\d{4])/(?P<month>\d{2})/(?P<day>\d{2})/(?P<object_id>\d+)/$', 'object_detail',
-		#dict(queryset=MicroEntry.objects.all())),
-	#(r'^microentries/(?P<year>\d{4})/(?P<month>\d{2})/$', 'archive_month',
-		#dict(queryset=MicroEntry.objects.all())),
-	#(r'^microentries/(?P<year>\d{4])/$', 'archive_year',
-		#dict(queryset=MicroEntry.objects.all())),
-#)
diff --git a/bn_django/journal/views.py b/bn_django/journal/views.py
deleted file mode 100644
index 60f00ef..0000000
--- a/bn_django/journal/views.py
+++ /dev/null
@@ -1 +0,0 @@
-# Create your views here.