diff options
| author | Markus Zapke-Grùˆndemann <info@keimlink.de> | 2011-12-30 01:56:27 +0100 |
|---|---|---|
| committer | Markus Zapke-Grùˆndemann <info@keimlink.de> | 2011-12-30 01:56:27 +0100 |
| commit | 14fc18cb34cbbec5b5f771f60fddfa929b3214a5 (patch) | |
| tree | 484feae662578dbc6023bd754fcec32424a06a8e /sublab_project | |
| parent | 4d759e6c57c70d26ccf2eff06cdb91496225abc2 (diff) | |
| parent | 27300433922788ed6630ae61608517780385f876 (diff) | |
Merge branch 'master' of sublab.org:subweb
Diffstat (limited to 'sublab_project')
| -rw-r--r-- | sublab_project/news/models.py | 2 | ||||
| -rw-r--r-- | sublab_project/news/templates/news/news_detail.html | 10 | ||||
| -rw-r--r-- | sublab_project/news/templates/news/news_list.html | 5 | ||||
| -rw-r--r-- | sublab_project/news/urls.py | 3 | ||||
| -rw-r--r-- | sublab_project/static/css/sublab.css | 7 | ||||
| -rw-r--r-- | sublab_project/templates/base.html | 3 |
6 files changed, 24 insertions, 6 deletions
diff --git a/sublab_project/news/models.py b/sublab_project/news/models.py index 72074a0..cd98248 100644 --- a/sublab_project/news/models.py +++ b/sublab_project/news/models.py @@ -38,4 +38,4 @@ class News(models.Model): @models.permalink def get_absolute_url(self): - return ('news_detail', (), {'id': self.id}) + return ('news_detail', (), {'slug': self.slug}) diff --git a/sublab_project/news/templates/news/news_detail.html b/sublab_project/news/templates/news/news_detail.html new file mode 100644 index 0000000..e3a0de1 --- /dev/null +++ b/sublab_project/news/templates/news/news_detail.html @@ -0,0 +1,10 @@ +{% extends 'base.html' %} + +{% block title %}{{ object.title }}{% endblock %} + +{% block content %} + <p class="news_date">{{ object.date_updated|date:"DATETIME_FORMAT" }}</p> + <h2 id="{{ object.slug }}">{{ object.title }}</h3> + <p>{{ object.content_html|safe }}</p> + <p class="header">{{ object.author }}</p> +{% endblock content %} diff --git a/sublab_project/news/templates/news/news_list.html b/sublab_project/news/templates/news/news_list.html index ab998e8..6330ffb 100644 --- a/sublab_project/news/templates/news/news_list.html +++ b/sublab_project/news/templates/news/news_list.html @@ -1,10 +1,11 @@ {% extends 'base.html' %} {%block content %} + <h2>sublab - news</h2> {% for post in news_list %} <h3 id="{{ post.slug }}"> - <a>{{ post.date_updated|date }} - {{ post.title }}</a> + <a href="{{ post.get_absolute_url }}">{{ post.date_updated|date }} - {{ post.title }}</a> </h3> - <p>{{ post.content }}</p> + <p>{{ post.content_html|safe }}</p> {% endfor %} {% endblock content %} diff --git a/sublab_project/news/urls.py b/sublab_project/news/urls.py index a1c5c0a..c26d12d 100644 --- a/sublab_project/news/urls.py +++ b/sublab_project/news/urls.py @@ -4,5 +4,6 @@ from django.views.generic import ListView, DetailView from news.models import News urlpatterns = patterns('', - url(r'^$', ListView.as_view(model=News, paginate_by=8), name='news_list') + url(r'^$', ListView.as_view(model=News, paginate_by=8), name='news_list'), + url(r'^news/(?P<slug>[-\w]+)/$', DetailView.as_view(model=News), name='news_detail'), ) diff --git a/sublab_project/static/css/sublab.css b/sublab_project/static/css/sublab.css index 20e9c5b..6a974f6 100644 --- a/sublab_project/static/css/sublab.css +++ b/sublab_project/static/css/sublab.css @@ -250,6 +250,13 @@ p.header { margin: 10px; } +p.news_date { + color: #ddd; + margin-bottom: -20px; + margin-left: 10px; + font-size: 10px; +} + span.header { background-color: rgba(16, 16, 16, 0.75); padding: 5px 10px 5px 10px; diff --git a/sublab_project/templates/base.html b/sublab_project/templates/base.html index 63b0f72..4c478d7 100644 --- a/sublab_project/templates/base.html +++ b/sublab_project/templates/base.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> - <title>{% block title %}sublab - Ein Hackerspace in Leipzig{% endblock %}</title> + <title>sublab - {% block title %}Ein Hackerspace in Leipzig{% endblock %}</title> <meta name="author" content="sublab e.V."> <meta name="robots" content="index,follow"> @@ -129,7 +129,6 @@ {% block content %} This is where the content would be. {% endblock %} - <hr> </div> <div class="footer"> |