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

[Chris Lamb]

The following commit has been merged in the master branch:
commit 204bbbf2c6d73e4b88f9ad507127db23458f11b0
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Jul 29 22:07:02 2010 -0400

    Make wizard a bit nicer by taking copy from live-magic
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/templates/config/add.html b/templates/config/add.html
index 70d6f9d..bf0f840 100644
--- a/templates/config/add.html
+++ b/templates/config/add.html
@@ -14,7 +14,7 @@
 
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
 {{ previous_fields|safe }}
-<input type="submit" value="Next">
+<input type="submit" value="{% block next %}Next{% endblock %}">
 </form>
 
 <p>Step {{ step }} of {{ step_count }}</p>
diff --git a/templates/config/add_0.html b/templates/config/add_0.html
index c21af50..ecd4db7 100644
--- a/templates/config/add_0.html
+++ b/templates/config/add_0.html
@@ -1 +1,11 @@
 {% extends "config/add.html" %}
+
+{% block add_content %}
+
+<h2>Choose image type</h2>
+
+<p>What type of image would you like to build?</p>
+
+{{ form.base }}
+
+{% endblock %}
diff --git a/templates/config/add_1.html b/templates/config/add_1.html
index c21af50..3bf76f8 100644
--- a/templates/config/add_1.html
+++ b/templates/config/add_1.html
@@ -1 +1,13 @@
 {% extends "config/add.html" %}
+
+{% block add_content %}
+
+<h2>Select distribution</h2>
+
+<p>What distribution of Debian would you like to build?</p>
+
+<p>If unsure, select "<em>Stable (lenny)</em>"</p>
+
+{{ form.distribution }}
+
+{% endblock %}
diff --git a/templates/config/add_2.html b/templates/config/add_2.html
index c21af50..ed5afe9 100644
--- a/templates/config/add_2.html
+++ b/templates/config/add_2.html
@@ -1 +1,11 @@
 {% extends "config/add.html" %}
+
+{% block add_content %}
+
+<h2>Select media type</h2>
+
+<p>What media type would you like to target?</p>
+
+{{ form.media_type }}
+
+{% endblock %}
diff --git a/templates/config/add_3.html b/templates/config/add_3.html
index c21af50..a3a8a56 100644
--- a/templates/config/add_3.html
+++ b/templates/config/add_3.html
@@ -1 +1,13 @@
 {% extends "config/add.html" %}
+
+{% block add_content %}
+
+<h2>Select architecture</h2>
+
+<p>What architecture would you like to build for?</p>
+
+<p>If unsure, select "<em>i386</em>"</p>
+
+{{ form.architecture }}
+
+{% endblock %}
diff --git a/templates/config/add_4.html b/templates/config/add_4.html
index c21af50..6f30b04 100644
--- a/templates/config/add_4.html
+++ b/templates/config/add_4.html
@@ -1 +1,13 @@
 {% extends "config/add.html" %}
+
+{% block add_content %}
+
+<h2>Select Debian Installer integration</h2>
+
+<p>Selecting "<em>yes</em>" below adds additional boot options that launch the Debian Installer, the official installation system for Debian Systems.</p>
+
+<p>If unsure, select "<em>no</em>"</p>
+
+{{ form.installer }}
+
+{% endblock %}
diff --git a/templates/config/add_5.html b/templates/config/add_5.html
index c21af50..354227e 100644
--- a/templates/config/add_5.html
+++ b/templates/config/add_5.html
@@ -1 +1,15 @@
 {% extends "config/add.html" %}
+
+{% block add_content %}
+
+<h2>Select locale and keyboard layout</h2>
+
+<p>A locale is an identifer that defines, country and related formatting settings. If ensure, please use the defaults.</p>
+
+<table style="padding: 1em">
+{{ form }}
+</table>
+
+{% endblock %}
+
+{% block next %}Finish{% endblock %}

-- 
live-studio