@@ -32,4 +32,4 @@ class Item(models.Model):
body = models.XMLField()
section = models.ForeignKey(Section)
def __unicode__(self):
- return "%s %s" % (self.author, unicode(self.section))
+ return "%s: '%s' %s" % (self.author, unicode(self.title), unicode(self.section))
modelica/newsletter/models.py
@@ -62,12 +62,12 @@
<h4> Table of Contents</h4>
<ul>
-<li><a href="#{{issue.title|slugify}}"><i>{{issue.title}}</i></a> </li>
+<li><a href="#letter"><i>{{issue.title}}</i></a> </li>
{% for sec in secs %}
<li><i>{{sec.obj.title}}</i></li>
<ul>
{% for item in sec.items %}
- <li><a href="#{{item.title|slugify}}">{{item.title}}</a> </li>
+ <li><a href="#item{{item.id}}">{{item.title}}</a> </li>
{% endfor %}
</ul>
{% endfor %}
@@ -77,7 +77,7 @@
<div>
-<h2><a name="{{issue.title|slugify}}">{{issue.title}}</a></h2>
+<h2><a name="letter">{{issue.title}}</a></h2>
<p> </p>
{{issue.body|safe}}
@@ -104,7 +104,7 @@ Hilding Elmqvist, Treasurer (Dynasim AB, Sweden)
{% for item in sec.items %}
- <h2><a name="{{item.tag|slugify}}">{{item.title}}</a></h2>
+ <h2><a name="item{{item.id}}">{{item.title}}</a></h2>
<br> <br>
{% if item.image %}
<img class="image-right" src="{{item.image.url}}" alt="{{item.title}}">
modelica/newsletter/templates/render.html
@@ -5,12 +5,16 @@ from modelica.newsletter.models import *
def index(request):
return HttpResponse("Newsletter index")
+def _dweight(s1,s2):
+ return s1['obj'].weight-s2['obj'].weight;
+
def render(request, id):
newsletter = Newsletter.objects.get(id=id)
secobjs = Section.objects.filter(issue=newsletter)
secs = []
for obj in secobjs:
secs.append({'obj': obj, 'items': Item.objects.filter(section=obj)})
+ secs.sort(_dweight)
t = loader.get_template('render.html')
c = Context({'issue': newsletter, 'secs': secs})
return HttpResponse(t.render(c))
modelica/newsletter/views.py
@@ -39,7 +39,7 @@ USE_I18N = True
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = os.path.join(PROJECT_PATH, "images")
+MEDIA_ROOT = os.path.join(PROJECT_PATH, "media")
STATIC_DOC_ROOT = os.path.join(PROJECT_PATH, "images")
modelica/settings.py
@@ -14,6 +14,8 @@ urlpatterns = patterns('',
# (r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^newsletter/\d+/images/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.STATIC_DOC_ROOT}),
+ (r'^media/(?P<path>.*)$', 'django.views.static.serve',
+ {'document_root': settings.MEDIA_ROOT}),
(r'^images/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.STATIC_DOC_ROOT}),
(r'^newsletter/$', 'modelica.newsletter.views.index'),
modelica/urls.py
94bcb604ba2973ac4229cb65a405f3dc86ceac2b
Dietmar Winkler
Dietmar.Winkler@hit.no
http://github.com/mtiller/modelica-newsletter/commit/0b88c0f46c374ace74323d00681643738176e680
0b88c0f46c374ace74323d00681643738176e680
2009-10-29T00:19:29-07:00
2009-10-29T00:19:29-07:00
Changes of Mike (done on the server) applied and uploaded.
9f869af2a7a60189aba758215d68e414d2bfab3e
Dietmar Winkler
Dietmar.Winkler@hit.no