[cmsiki-svn] SF.net SVN: cmsiki: [9] trunk/cmsiki

[<cn...@us...>]

Revision: 9
          http://cmsiki.svn.sourceforge.net/cmsiki/?rev=9&view=rev
Author:   cnu
Date:     2007-03-24 09:30:54 -0700 (Sat, 24 Mar 2007)

Log Message:
-----------
added category list to sidebar

Modified Paths:
--------------
    trunk/cmsiki/templates/story/story_archive.html
    trunk/cmsiki/templates/story/story_archive_day.html
    trunk/cmsiki/templates/story/story_archive_month.html
    trunk/cmsiki/urls.py

Modified: trunk/cmsiki/templates/story/story_archive.html
===================================================================
--- trunk/cmsiki/templates/story/story_archive.html	2007-03-24 16:10:26 UTC (rev 8)
+++ trunk/cmsiki/templates/story/story_archive.html	2007-03-24 16:30:54 UTC (rev 9)
@@ -1,6 +1,16 @@
 {% extends "base.html" %}
 {% block title %}Home{% endblock %}
 
+{% block categories %}
+<ul>
+  {% for category in categories %}
+  <li><a href="/category/{{ category }}" 
+	 title="View all posts filed under {{ category }}">{{ category }}</a>
+  </li>
+  {% endfor %}
+</ul>
+{% endblock %}
+
 {% block post %}
   {% for story in latest %}
   <div class="post">

Modified: trunk/cmsiki/templates/story/story_archive_day.html
===================================================================
--- trunk/cmsiki/templates/story/story_archive_day.html	2007-03-24 16:10:26 UTC (rev 8)
+++ trunk/cmsiki/templates/story/story_archive_day.html	2007-03-24 16:30:54 UTC (rev 9)
@@ -1,5 +1,16 @@
 {% extends "base.html" %}
 {% block title %}{{ day|date:"F j" }} archive{% endblock %}
+
+{% block categories %}
+<ul>
+  {% for category in categories %}
+  <li><a href="/category/{{ category }}" 
+	 title="View all posts filed under {{ category }}">{{ category }}</a>
+  </li>
+  {% endfor %}
+</ul>
+{% endblock %}
+
 {% block content %}
 <div class="content">
   {% for story in object_list %}

Modified: trunk/cmsiki/templates/story/story_archive_month.html
===================================================================
--- trunk/cmsiki/templates/story/story_archive_month.html	2007-03-24 16:10:26 UTC (rev 8)
+++ trunk/cmsiki/templates/story/story_archive_month.html	2007-03-24 16:30:54 UTC (rev 9)
@@ -1,5 +1,16 @@
 {% extends "base.html" %}
 {% block title %}{{ month|date:"F" }} month archive{% endblock %}
+
+{% block categories %}
+<ul>
+  {% for category in categories %}
+  <li><a href="/category/{{ category }}" 
+	 title="View all posts filed under {{ category }}">{{ category }}</a>
+  </li>
+  {% endfor %}
+</ul>
+{% endblock %}
+
 {% block content %}
 <div class="content">
 

Modified: trunk/cmsiki/urls.py
===================================================================
--- trunk/cmsiki/urls.py	2007-03-24 16:10:26 UTC (rev 8)
+++ trunk/cmsiki/urls.py	2007-03-24 16:30:54 UTC (rev 9)
@@ -16,11 +16,15 @@
     (r'^admin/', include('django.contrib.admin.urls')),
 #    (r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/(?P<slug>[-\w]+)/$', 'object_detail', dict(info_dict, slug_field='slug')),
     (r'^(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{1,2})/(?P<slug>[-\w]+)/$', 'object_detail',\
-     dict(info_dict, month_format='%m', slug_field='slug',extra_context={'categories':Category.objects.all()})),
-    (r'^(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{1,2})/$',                  'archive_day',   dict(info_dict, month_format='%m')),
-    (r'^(?P<year>\d{4})/(?P<month>\d{2})/$',                                   'archive_month', dict(info_dict, month_format='%m')),
-    (r'^(?P<year>\d{4})/$',                                                    'archive_year',  info_dict),
-    (r'^/?$',                                                                  'archive_index', info_dict),
+     dict(info_dict, month_format='%m', slug_field='slug', extra_context={'categories':Category.objects.all()})),
+    (r'^(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{1,2})/$',                  'archive_day',  \
+     dict(info_dict, month_format='%m', extra_context={'categories':Category.objects.all()})),
+    (r'^(?P<year>\d{4})/(?P<month>\d{2})/$',                                   'archive_month',\
+     dict(info_dict, month_format='%m', extra_context={'categories':Category.objects.all()})),
+    (r'^(?P<year>\d{4})/$',                                                    'archive_year', \
+     dict(info_dict,  extra_context={'categories':Category.objects.all()})),
+    (r'^/?$',                                                                  'archive_index',\
+     dict(info_dict, extra_context={'categories':Category.objects.all()})),
 )
 
 if settings.DEBUG:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.