Merge branch 'master' of sublab.org:subweb

Conflicts:
	requirements.txt

2 files changed, 18 insertions, 0 deletions

diff --git a/sublab_project/news/templates/news/news_list.html b/sublab_project/news/templates/news/news_list.html
new file mode 100644
index 0000000..ab998e8
--- /dev/null
+++ b/sublab_project/news/templates/news/news_list.html
@@ -0,0 +1,10 @@
+{% extends 'base.html' %}
+
+{%block content %}
+	{% for post in news_list %}
+		<h3 id="{{ post.slug }}">
+			<a>{{ post.date_updated|date }} - {{ post.title }}</a>
+		</h3>
+		<p>{{ post.content }}</p>
+	{% endfor %}
+{% endblock content %}
diff --git a/sublab_project/news/urls.py b/sublab_project/news/urls.py
new file mode 100644
index 0000000..a1c5c0a
--- /dev/null
+++ b/sublab_project/news/urls.py
@@ -0,0 +1,8 @@
+from django.conf.urls.defaults import patterns, include, url
+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')
+)