[SCM] live-studio branch, master, updated. a6cf0ecfb45b6dcd15adbc50b4b6d63d97500eca

[Chris Lamb]

The following commit has been merged in the master branch:
commit a6cf0ecfb45b6dcd15adbc50b4b6d63d97500eca
Author: Chris Lamb <lamby at debian.org>
Date:   Sat Jul 31 23:36:52 2010 -0400

    Add Config.name to the configuration wizard

diff --git a/live_studio/config/forms.py b/live_studio/config/forms.py
index 0bfdd30..a08e486 100644
--- a/live_studio/config/forms.py
+++ b/live_studio/config/forms.py
@@ -14,6 +14,7 @@ PAGES = (
     ('architecture',),
     ('installer',),
     ('locale', 'keyboard_layout'),
+    ('name',),
 )
 
 WIZARD_FORMS = []
diff --git a/templates/config/add_5.html b/templates/config/add_5.html
index 354227e..202e50f 100644
--- a/templates/config/add_5.html
+++ b/templates/config/add_5.html
@@ -11,5 +11,3 @@
 </table>
 
 {% endblock %}
-
-{% block next %}Finish{% endblock %}
diff --git a/templates/config/add_6.html b/templates/config/add_6.html
new file mode 100644
index 0000000..30f2760
--- /dev/null
+++ b/templates/config/add_6.html
@@ -0,0 +1,13 @@
+{% extends "config/add.html" %}
+
+{% block add_content %}
+
+<h2>Choose a name for this configuration</h2>
+
+<table style="padding: 1em">
+{{ form }}
+</table>
+
+{% endblock %}
+
+{% block next %}Finish{% endblock %}

-- 
live-studio