Changeset 6 for bitstructures

Timestamp:

09/17/07 18:48:54 (16 months ago)

Author:

simon

Message:

Added viewing of drafts.
Added a list of drafts to the info-block.

Location:

bitstructures/trunk

Files:

• css/bitstructures.css (modified) (2 diffs)
• substructure/models.py (modified) (3 diffs)
• substructure/templates/substructure/base.html (modified) (2 diffs)
• substructure/templates/substructure/entry.html (modified) (1 diff)
• substructure/urls.py (modified) (1 diff)
• substructure/views.py (modified) (1 diff)

bitstructures/trunk/css/bitstructures.css

@@ -31 +31 @@
 }
 
-#about {
+.info-entry {
         padding: 40px 60px 0 0;
 }
@@ -77 +77 @@
         padding: 5px;
 }
+
+#drafts ul {
+        margin-left: 0;
+        padding-left: 0;
+        list-style-type: none;
+}
+
+#drafts li {
+        padding-bottom: 6px;
+}
+
+#drafts li a {
+        text-decoration: none;
+}

bitstructures/trunk/substructure/models.py

@@ -7 +7 @@
     >>> test1.id = 1
     >>> test1.slug = 'testentry1'
-    >>> bool(test1.date)
+    >>> test1.is_published()
     False
-    >>> bool(test1.is_public)
-    False
+    >>> test1.is_draft()
+    True
     >>> test1.get_absolute_url()
-    '/testentry1'
+    '/drafts/testentry1'
     >>> test2 = Entry()
     >>> test2.id = 2
     >>> test2.slug = 'testentry2'
-    >>> test2.date = datetime(2001, 2, 3)
-    >>> bool(test2.date)
+    >>> test2.date_published = datetime(2001, 2, 3)
+    >>> test2.is_published()
     True
-    >>> bool(test2.is_public)
+    >>> test2.is_draft()
     False
     >>> test2.get_absolute_url()
@@ -27 +27 @@
     slug = models.SlugField(unique=True, blank=False)
     title = models.CharField(maxlength=200, blank=False)
-    date = models.DateTimeField(null=True, blank=True)
-    is_public = models.BooleanField()
+    date_published = models.DateTimeField(null=True, blank=True)
     text = models.TextField(blank=False)
 
@@ -34 +33 @@
         return self.title
 
+    def is_published(self):
+        return bool(self.date_published)
+
+    def is_draft(self):
+        return not self.is_published()
+
     def get_absolute_url(self):
-        if self.date:
-            year = self.date.year
-            month = self.date.month
+        if self.is_published():
+            year = self.date_published.year
+            month = self.date_published.month
             return '/%04d/%02d/%s' % (year, month, self.slug)
         else:
-            return '/%s' % (self.slug)
+            return '/drafts/%s' % (self.slug)
 
     class Admin:
         fields = (
-            (None, {'fields': ('title', 'slug', 'date', 'is_public')}),
+            (None, {'fields': ('title', 'slug', 'date_published')}),
             (None, {'fields': ('text',), 'classes': 'monospace'})
         )
-        list_display = ('title', 'slug', 'date', 'is_public', 'get_absolute_url')
-        ordering = ['-date']
+        list_display = ('title', 'get_absolute_url', 'date_published')
+        ordering = ['-date_published']

bitstructures/trunk/substructure/templates/substructure/base.html

@@ -16 +16 @@
 
 <div id="info-block">
-<div id="about">
+
+<div class="info-entry">
 <h2>About me</h2>
 <p>Simon builds and designs web apps and infrastructure.
@@ -23 +24 @@
 <p><a href="http://del.icio.us/simonbates">del.icio.us/simonbates</a></p>
 </div>
+
+{% if drafts %}
+<div id="drafts" class="info-entry">
+<h2>Drafts</h2>
+<ul>
+{% for entry in drafts %}
+<li><a href="{{ entry.get_absolute_url }}">{{ entry.title|escape }}</a></li>
+{% endfor %}
+</ul>
+<p><a href="/admin/substructure/entry/add/">new entry</a></p>
+</div>
+{% endif %}
+
 </div>
 

bitstructures/trunk/substructure/templates/substructure/entry.html

@@ -5 +5 @@
 <h2><a href="{{ entry.get_absolute_url }}">{{ entry.title|escape }}</a></h2>
 
-{% if entry.date %}
-<p>{{ entry.date|date:"F j, Y" }}</p>
+{% if entry.date_published %}
+<p>{{ entry.date_published|date:"F j, Y" }}</p>
+{% endif %}
+
+{% if user_can_change_entry %}
+<p><a href="/admin/substructure/entry/{{ entry.id }}/">edit</a></p>
 {% endif %}
 

bitstructures/trunk/substructure/urls.py

@@ -4 +4 @@
     (r'^$', 'substructure.views.blog'),
     (r'^(?P<year>\d{4})/(?P<month>\d{2})/(?P<slug>[a-z0-9-]+)$',
-        'substructure.views.dated_entry_page'),
-    (r'^(?P<slug>[a-z0-9-]+)$',
-        'substructure.views.undated_entry_page')
+        'substructure.views.entry_page'),
+    (r'^drafts/(?P<slug>[a-z0-9-]+)$', 'substructure.views.draft_page')
 )

bitstructures/trunk/substructure/views.py

@@ -5 +5 @@
 
 def blog(request):
-    entry_list = Entry.objects.filter(date__isnull=False, is_public=True).order_by('-date')
-    return render_to_response('substructure/blog.html',
-                              { 'MEDIA_URL': settings.MEDIA_URL,
-                                'entry_list': entry_list })
+    data = get_context_data(request)
+    data['entry_list'] = Entry.objects.filter(date_published__isnull=False).order_by('-date_published')
+    return render_to_response('substructure/blog.html', data)
 
-def dated_entry_page(request, year, month, slug):
+def entry_page(request, year, month, slug):
     entry = get_object_or_404(Entry, slug=slug)
-    if not entry.is_public:
+    if not entry.is_published():
         raise Http404
-    if not entry.date:
+    if int(year) != entry.date_published.year:
         raise Http404
-    if int(year) != entry.date.year:
+    if int(month) != entry.date_published.month:
         raise Http404
-    if int(month) != entry.date.month:
+    data = get_context_data(request)
+    data['entry'] = entry
+    return render_to_response('substructure/entry_page.html', data)
+
+def draft_page(request, slug):
+    if not user_can_change_entry(request):
         raise Http404
-    return render_to_response('substructure/entry_page.html',
-                              { 'MEDIA_URL': settings.MEDIA_URL,
-                                'entry': entry })
+    entry = get_object_or_404(Entry, slug=slug)
+    if not entry.is_draft():
+        raise Http404
+    data = get_context_data(request)
+    data['entry'] = entry
+    return render_to_response('substructure/entry_page.html', data)
 
-def undated_entry_page(request, slug):
-    entry = get_object_or_404(Entry, slug=slug)
-    if not entry.is_public:
-        raise Http404
-    if entry.date:
-        raise Http404
-    return render_to_response('substructure/entry_page.html',
-                              { 'MEDIA_URL': settings.MEDIA_URL,
-                                'entry': entry })
+def get_context_data(request):
+    data = { 'MEDIA_URL': settings.MEDIA_URL }
+    if user_can_change_entry(request):
+        data['user_can_change_entry'] = True
+        data['drafts'] = get_drafts()
+    return data
+
+def user_can_change_entry(request):
+    return request.user.has_perm('change_entry')
+
+def get_drafts():
+    return Entry.objects.filter(date_published__isnull=True).order_by('title')