[SCM] live-studio branch, master, updated. 178412903b78ac9196214b42bfe241d5a20bb5ec

[Chris Lamb]

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

    Use a block override to do the current page title on the wizard

diff --git a/templates/config/add.html b/templates/config/add.html
index 7d490b1..9a0e105 100644
--- a/templates/config/add.html
+++ b/templates/config/add.html
@@ -4,6 +4,8 @@
 
 <h3>Add new configuration</h3>
 
+<h2>{% block add_title %}Missing "add_title" block override {% endblock %}</h2>
+
 <form class="add_config" action="" method="POST">{% csrf_token %}
 
 {% block add_content %}
diff --git a/templates/config/add_0.html b/templates/config/add_0.html
index 77792d1..2f60bf3 100644
--- a/templates/config/add_0.html
+++ b/templates/config/add_0.html
@@ -1,8 +1,8 @@
 {% extends "config/add.html" %}
 
-{% block add_content %}
+{% block add_title %}Choose image type{% endblock %}
 
-<h2>Choose image type</h2>
+{% block add_content %}
 
 <p>What type of image would you like to build?</p>
 
diff --git a/templates/config/add_1.html b/templates/config/add_1.html
index 3bf76f8..6a3eb90 100644
--- a/templates/config/add_1.html
+++ b/templates/config/add_1.html
@@ -1,8 +1,8 @@
 {% extends "config/add.html" %}
 
-{% block add_content %}
+{% block add_title %}Select distribution{% endblock %}
 
-<h2>Select distribution</h2>
+{% block add_content %}
 
 <p>What distribution of Debian would you like to build?</p>
 
diff --git a/templates/config/add_2.html b/templates/config/add_2.html
index ed5afe9..25b922b 100644
--- a/templates/config/add_2.html
+++ b/templates/config/add_2.html
@@ -1,8 +1,8 @@
 {% extends "config/add.html" %}
 
-{% block add_content %}
+{% block add_title %}Select media type{% endblock %}
 
-<h2>Select media type</h2>
+{% block add_content %}
 
 <p>What media type would you like to target?</p>
 
diff --git a/templates/config/add_3.html b/templates/config/add_3.html
index a3a8a56..fa6fa17 100644
--- a/templates/config/add_3.html
+++ b/templates/config/add_3.html
@@ -1,8 +1,8 @@
 {% extends "config/add.html" %}
 
-{% block add_content %}
+{% block add_title %}Select architecture{% endblock %}
 
-<h2>Select architecture</h2>
+{% block add_content %}
 
 <p>What architecture would you like to build for?</p>
 
diff --git a/templates/config/add_4.html b/templates/config/add_4.html
index 6f30b04..90aa4aa 100644
--- a/templates/config/add_4.html
+++ b/templates/config/add_4.html
@@ -1,8 +1,8 @@
 {% extends "config/add.html" %}
 
-{% block add_content %}
+{% block add_title %}Select Debian Installer integration{% endblock %}
 
-<h2>Select Debian Installer integration</h2>
+{% block add_content %}
 
 <p>Selecting "<em>yes</em>" below adds additional boot options that launch the Debian Installer, the official installation system for Debian Systems.</p>
 
diff --git a/templates/config/add_5.html b/templates/config/add_5.html
index 202e50f..e5f540a 100644
--- a/templates/config/add_5.html
+++ b/templates/config/add_5.html
@@ -1,8 +1,8 @@
 {% extends "config/add.html" %}
 
-{% block add_content %}
+{% block add_title %}Select locale and keyboad layout{% endblock %}
 
-<h2>Select locale and keyboard layout</h2>
+{% block add_content %}
 
 <p>A locale is an identifer that defines, country and related formatting settings. If ensure, please use the defaults.</p>
 
diff --git a/templates/config/add_6.html b/templates/config/add_6.html
index 30f2760..ade6e36 100644
--- a/templates/config/add_6.html
+++ b/templates/config/add_6.html
@@ -1,8 +1,8 @@
 {% extends "config/add.html" %}
 
-{% block add_content %}
+{% block add_title %}Choose a name for this configuration{% endblock %}
 
-<h2>Choose a name for this configuration</h2>
+{% block add_content %}
 
 <table style="padding: 1em">
 {{ form }}

-- 
live-studio