Merge branch 'news_app'

idre/settings.py

@@ -1,12 +1,4 @@
-"""
-Django settings for idre project.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/1.7/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.7/ref/settings/
-"""
+""" Django settings for idre project. """
 
 import os
 
@@ -33,7 +25,8 @@ INSTALLED_APPS = (
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
-    "label"
+    "label",
+    "news"
 )
 
 MIDDLEWARE_CLASSES = (

idre/urls.py

@@ -5,16 +5,18 @@ from django.contrib import admin
 import idre.settings
 import idre.views
 import label.urls
+import news.urls
 
 
 admin.autodiscover()
 
 
-urlpatterns = [
-    url(r"^$", idre.views.home, name = "home")
-] + label.urls.urlpatterns + [
-    url(r"^admin/", include(admin.site.urls))
-]
+urlpatterns = (
+    [ url(r"^(?:about/)?$", idre.views.about_view, name = "about") ] +
+    label.urls.urlpatterns +
+    news.urls.urlpatterns  +
+    [ url(r"^admin/", include(admin.site.urls)) ]
+)
 
 if idre.settings.DEBUG:
     urlpatterns += static(

idre/views.py

@@ -1,5 +1,5 @@
 from django.shortcuts import render
 
 
-def home(request):
-    return render(request, "idre/home.html")
+def about_view(request):
+    return render(request, "about.html")

news/admin.py

@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+from news.models import Article
+
+
+admin.site.register(Article)

news/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class NewsConfig(AppConfig):
+    name = "news"

news/migrations/0001_initial.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.1 on 2016-02-01 19:25
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Article',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=256)),
+                ('content', models.TextField(help_text='Markdown formatting supported')),
+                ('author', models.CharField(max_length=64)),
+                ('date', models.DateField()),
+            ],
+            options={
+                'ordering': ('date',),
+            },
+        ),
+    ]

news/models.py

@@ -0,0 +1,15 @@
+from django.db import models
+
+
+ARTICLE_CONTENT_HINT = "Markdown formatting supported"
+
+class Article(models.Model):
+    """ News article. """
+
+    title = models.CharField(max_length = 256)
+    content = models.TextField(help_text = ARTICLE_CONTENT_HINT)
+    author = models.CharField(max_length = 64)
+    date = models.DateField()
+
+    class Meta(object):
+        ordering = ("date",)

news/templates/news/news.html

@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% load static %}
+
+
+{% block stylesheets %}
+<link rel="stylesheet" href="{% static 'css/news.css' %}" />
+{% endblock %}
+
+
+{% block content %}
+<section id="news">
+
+{% for article in articles %}
+  <article>
+    <p class="article_header">
+      <span class="title">{{ article.title }}</span>
+      <span class="author">{{ article.author }}</span>,
+      <span class="date">{{ article.date }}</span>
+    </p>
+    {% autoescape off %}
+    {{ article.content }}
+    {% endautoescape %}
+  </article>
+  {% if not forloop.last %}<hr />{% endif %}
+{% endfor %}
+
+</section>
+{% endblock %}

news/urls.py

@@ -0,0 +1,8 @@
+from django.conf.urls import url
+
+import news.views
+
+
+urlpatterns = [
+    url(r"^news/$", news.views.articles_view, name = "news"),
+]

news/views.py

@@ -0,0 +1,12 @@
+from django.shortcuts import render
+import markdown
+
+from news.models import Article
+
+
+def articles_view(request):
+    articles = Article.objects.all().order_by("date").reverse()
+    for article in articles:
+        article.content = markdown.markdown(article.content)
+    context = { "articles": articles }
+    return render(request, "news/news.html", context)

static/css/news.css

@@ -0,0 +1,22 @@
+#news article .title {
+  font-size: 1.2em;
+  font-weight: bold;
+}
+
+#news article .author,
+#news article .date {
+  font-style: oblique;
+}
+
+#news hr {
+  border-color: #929292 -moz-use-text-color -moz-use-text-color;
+  border-right: 0px none;
+  border-style: solid none none;
+  border-width: 1px 0px 0px;
+  margin-bottom: 20px;
+  margin-top: 20px;
+  -moz-border-bottom-colors: none;
+  -moz-border-left-colors: none;
+  -moz-border-right-colors: none;
+  -moz-border-top-colors: none;
+}

templates/base.html

@@ -23,8 +23,10 @@
     </header>
 
     <nav>
+      <a href="/news/">news</a> |
       <a href="/artists/">artists</a> |
-      <a href="/releases/">releases</a>
+      <a href="/releases/">releases</a> |
+      <a href="/about/">about</a>
     </nav>
 
     <section id="content">