Changeset 24

Show
Ignore:
Timestamp:
12/02/07 15:33:29 (9 months ago)
Author:
simon
Message:

Added support for redirecting Atom feed requests to FeedBurner?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • bitstructures/trunk/css/bitstructures.css

    r15 r24  
    8484} 
    8585 
    86 a.subscribe { 
    87         color: #da5800; 
    88 } 
    89  
    9086a:hover { 
    9187        text-decoration: underline; 

  • bitstructures/trunk/substructure/urls.py

    r15 r24  
    11from django.conf.urls.defaults import * 
     2from django.conf import settings 
    23 
    3 urlpatterns = patterns('', 
    4     (r'^$', 'bitstructures.substructure.views.blog'), 
    5     (r'^(?P<year>\d{4})/(?P<month>\d{2})/(?P<slug>[a-z0-9-]+)$', 
    6         'bitstructures.substructure.views.entry_page'), 
    7     (r'^drafts/(?P<slug>[a-z0-9-]+)$', 'bitstructures.substructure.views.draft_page'), 
    8     (r'^atom.xml$', 'bitstructures.substructure.views.atom_feed') 
     4urlpatterns = patterns('bitstructures.substructure.views', 
     5    (r'^$', 'blog'), 
     6    (r'^(?P<year>\d{4})/(?P<month>\d{2})/(?P<slug>[a-z0-9-]+)$', 'entry_page'), 
     7    (r'^drafts/(?P<slug>[a-z0-9-]+)$', 'draft_page'), 
     8    (r'^fb-atom.xml$', 'atom_feed') 
    99) 
     10 
     11if hasattr(settings, 'SUBSTRUCTURE_FEEDBURNER_REDIRECT_URL'): 
     12    urlpatterns += patterns('', 
     13        (r'^atom.xml$', 'bitstructures.substructure.views.redirect_to_feedburner')) 
     14else: 
     15    urlpatterns += patterns('', 
     16        (r'^atom.xml$', 'bitstructures.substructure.views.atom_feed')) 

  • bitstructures/trunk/substructure/views.py

    r15 r24  
    1 from django.http import Http404, HttpResponse 
     1from django.http import Http404, HttpResponse, HttpResponseRedirect 
    22from django.shortcuts import get_object_or_404, render_to_response 
    33from django.template import Context, loader 
    44from django.contrib.sites.models import Site 
     5from django.conf import settings 
    56from bitstructures.substructure.models import Entry 
    6 import bitstructures.settings 
    77 
    88def blog(request): 
    …… 
    4646    return HttpResponse(t.render(c), mimetype='application/atom+xml') 
    4747 
     48def redirect_to_feedburner(request): 
     49    return HttpResponseRedirect(settings.SUBSTRUCTURE_FEEDBURNER_REDIRECT_URL) 
     50 
    4851def get_context_data(request): 
    49     data = { 'MEDIA_URL': bitstructures.settings.MEDIA_URL } 
     52    data = { 'MEDIA_URL': settings.MEDIA_URL } 
    5053    if user_can_change_entry(request): 
    5154        data['user_can_change_entry'] = True 

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

    r17 r24  
    2828<div class="info-entry"> 
    2929<h2>About me</h2> 
    30 <p>Simon Bates is an accessibility architect at the 
     30<p>Simon Bates is an accessibility software architect at the 
    3131<a href="http://atrc.utoronto.ca/">Adaptive Technology Resource Centre</a> 
    3232at the University of Toronto 
    …… 
    3535the <a href="http://dojotoolkit.org/">Dojo</a> JavaScript toolkit.</p> 
    3636<p><a href="http://del.icio.us/simonbates">del.icio.us/simonbates</a></p> 
    37 <p><a class="subscribe" href="/atom.xml"><img src="{{ MEDIA_URL }}images/feed-icon-14x14.png" alt="Subscribe"> Subscribe</a></p> 
     37<p><a href="/atom.xml"><img src="{{ MEDIA_URL }}images/feed-icon-14x14.png" alt="Site feed"> Site feed</a></p> 
    3838</div> 
    3939