[SCM] live-studio branch, master, updated. 3a5ece889e8e0abe86437994a4f02c59cd35f626

[Chris Lamb]

The following commit has been merged in the master branch:
commit 04c4170ef5738eeaaf6db3c77f820e081a1bd3ab
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Aug 1 12:25:55 2010 -0400

    Stub out the FAQ

diff --git a/live_studio/static/urls.py b/live_studio/static/urls.py
index 0709126..e55de06 100644
--- a/live_studio/static/urls.py
+++ b/live_studio/static/urls.py
@@ -2,4 +2,5 @@ from django.conf.urls.defaults import *
 
 urlpatterns = patterns('live_studio.static.views',
     url(r'^$', 'welcome', name='welcome'),
+    url(r'^faq$', 'faq', name='faq'),
 )
diff --git a/live_studio/static/views.py b/live_studio/static/views.py
index fba443b..6492ee2 100644
--- a/live_studio/static/views.py
+++ b/live_studio/static/views.py
@@ -10,3 +10,7 @@ def welcome(request):
         return HttpResponseRedirect(settings.LOGIN_REDIRECT_URL)
 
     return render_response(request, 'static/welcome.html', {})
+
+ at login_not_required
+def faq(request):
+    return render_response(request, 'static/faq.html', {})
diff --git a/templates/base.html b/templates/base.html
index ab8aacd..4f8f49e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -25,6 +25,7 @@
   <div id="navbar">
     <ul>
       <li><a href="{% url static:welcome %}">Home</a></li>
+      <li><a href="{% url static:faq %}">FAQ</a></li>
 
       {% if request.user.is_authenticated %}
       <li><a href="{% url auth_logout %}">Logout</a></li>
diff --git a/templates/static/faq.html b/templates/static/faq.html
new file mode 100644
index 0000000..cc0f2d8
--- /dev/null
+++ b/templates/static/faq.html
@@ -0,0 +1,33 @@
+{% extends "base.html" %}
+
+{% block breadcrumbs %}
+{{ block.super }} &raquo; FAQ
+{% endblock %}
+
+{% block content %}
+<h1>Frequently Asked Questions</h1>
+
+<ul class="toc"> 
+  <li><a href="#what">What is Debian Live Studio?</a></li> 
+  <li><a href="#bugs">How do I report bugs?</a></li> 
+  <li><a href="#hacking">How can I hack on Debian Live Studio?</a></li> 
+</ul> 
+
+<h2><a id="what">What is Debian Live Studio?</a></h2> 
+<p>Debian Live Studio is a web-based tool for building customised Debian images that do not require installation before they can be used. Live images can can book from various types of media, including CDs, USB sticks or via netbooting.</p>
+
+<h2><a id="bugs">How do I report bugs?</a></h2> 
+<p>Please email your bug report to <a href="debian-live at lists.debian.org">debian-live at lists.debian.org</a> or report it on the <tt>#debian-live</tt> IRC channel on <a href="http://oftc.net/">OFTC</a>.</p>
+
+</p>
+
+<h2><a id="hacking">How can I hack on Debian Live Studio?</a></h2> 
+<p>You can download the source using git:</p>
+
+<pre>
+  $ git clone git://live.debian.net/git/live-studio.git
+</pre>
+
+<p>You can then either send a merge request or a patch series to <a href="debian-live at lists.debian.org">debian-live at lists.debian.org</a>. It is recommended that you join the <tt>#debian-live</tt> IRC channel on <a href="http://oftc.net/">OFTC</a> to co-ordinate larger changes.</p>
+
+{% endblock %}

-- 
live-studio