Add simple help infrastructure, with an 'about' page.

We'll need the about page for adding attribution for included
components.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/apps/patchwork/urls.py b/apps/patchwork/urls.py
index f475e74f5175a81e64ec95ae403aaeeb9964efca..194f51294424d0a476296edaa7529a9320b87b53 100644 (file)
--- a/apps/patchwork/urls.py
+++ b/apps/patchwork/urls.py
@@ -50,4 +50,7 @@ urlpatterns = patterns('',
 
     # submitter autocomplete
     (r'^submitter/$', 'patchwork.views.submitter_complete'),
+
+    # help!
+    (r'^help/(?P<path>.*)$', 'patchwork.views.help'),
 )

diff --git a/apps/patchwork/views/base.py b/apps/patchwork/views/base.py
index 85014aff67aba86fe7b420da303dfb8068f7b332..b3b1c127a72c6e317205936317e41d4362365660 100644 (file)
--- a/apps/patchwork/views/base.py
+++ b/apps/patchwork/views/base.py
@@ -22,7 +22,7 @@ from patchwork.models import Patch, Project, Person
 from patchwork.filters import Filters
 from patchwork.forms import LoginForm, PatchForm
 from django.shortcuts import render_to_response, get_object_or_404
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.db import transaction
 from django.contrib.auth.models import User
 from django.contrib.auth.decorators import login_required
@@ -64,3 +64,12 @@ def submitter_complete(request):
        json_serializer = serializers.get_serializer("json")()
        json_serializer.serialize(queryset, ensure_ascii=False, stream=response)
     return response
+
+help_pages = {'': 'index.html', 'about/': 'about.html'}
+
+def help(request, path):
+    context = PatchworkRequestContext(request)
+    if help_pages.has_key(path):
+        return render_to_response('patchwork/help/' + help_pages[path], context)
+    raise Http404
+

diff --git a/templates/base.html b/templates/base.html
index df668aa27fed5f7522b5a7832fd1740a6680fc7a..b9b359f2c5c10154ff10258d159c0a60e33009a0 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -24,16 +24,14 @@
      <a href="{% url patchwork.views.user.profile %}">profile</a> ::
      <a href="{% url patchwork.views.user.todo_lists %}">todo
       ({{ user.get_profile.n_todo_patches }})</a><br/>
-     <a href="{% url auth_logout %}">logout</a><!-- ::
-     <a href="/help/">help</a> -->
+     <a href="{% url auth_logout %}">logout</a> ::
+     <a href="{% url patchwork.views.help path="about/" %}">about</a>
 {% else %}
      <a href="{% url auth_login %}">login</a>
      <br/>
      <a href="{% url registration_register %}">register</a>
-     <!--
      <br/>
-     <a href="/help/">help</a>
-     -->
+     <a href="{% url patchwork.views.help path="about/" %}">about</a>
 {% endif %}
    </div>
    <div style="clear: both;"></div>

diff --git a/templates/patchwork/help/about.html b/templates/patchwork/help/about.html
new file mode 100644 (file)
index 0000000..fa5094f
--- /dev/null
+++ b/templates/patchwork/help/about.html
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+
+{% block title %}About{% endblock %}
+{% block heading %} - About Patchwork{% endblock %}
+
+{% block body %}
+
+<p>Patchwork is free software, and is available from the
+<a href="http://ozlabs.org/~jk/projects/patchwork/">patchwork website</a>.</p>
+
+<p>Patchwork is built on the <a href="http://djangoproject.com/">django</a>
+web framework.</p>
+
+<p>Patchwork includes the <a
+href="http://code.google.com/p/django-registration/">django-registration</a>
+application.</a>
+
+{% endblock %}
+

diff --git a/templates/patchwork/help/index.html b/templates/patchwork/help/index.html
new file mode 100644 (file)
index 0000000..5cb6467
--- /dev/null
+++ b/templates/patchwork/help/index.html
@@ -0,0 +1,2 @@
+{% extends "base.html" %}
+