Index: classes/class.tx_staticdstools.php
===================================================================
--- classes/class.tx_staticdstools.php	(revision 29771)
+++ classes/class.tx_staticdstools.php	(working copy)
@@ -29,6 +29,12 @@
  */
 class tx_staticDStools {
 
+	/**
+	 * Step for the wizard. Can be manipulated by internal function
+	 *
+	 * @var int $step
+	 */
+	protected $step = 0;
 
 	/**
 	 *
@@ -36,14 +42,14 @@
 	 * @param		object		Instance of the class t3lib_tsStyleConfig
 	 */
 	function staticDsWizard($params, $pObj) {
-		$step = t3lib_div::_GP('dsWizardDoIt') ? intval(t3lib_div::_GP('dsWizardStep')) : 0;
+		$this->step = t3lib_div::_GP('dsWizardDoIt') ? intval(t3lib_div::_GP('dsWizardStep')) : 0;
 		$conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['templavoila']);
 
-		$title = $GLOBALS['LANG']->sL('LLL:EXT:templavoila/res1/language/template_conf.xml:staticDS.wizard.title.' . $step);
-		$description = $GLOBALS['LANG']->sL('LLL:EXT:templavoila/res1/language/template_conf.xml:staticDS.wizard.description.' . $step);
+		$title = $GLOBALS['LANG']->sL('LLL:EXT:templavoila/res1/language/template_conf.xml:staticDS.wizard.title.' . $this->step);
+		$description = $GLOBALS['LANG']->sL('LLL:EXT:templavoila/res1/language/template_conf.xml:staticDS.wizard.description.' . $this->step);
 		$out = '<h2>' . htmlspecialchars($title) . '</h2>';
 
-		switch($step) {
+		switch($this->step) {
 			case 1:
 				$ok = array(TRUE, TRUE);
 				if (t3lib_div::_GP('dsWizardDoIt')) {
@@ -63,9 +69,11 @@
 						$controls .= $this->getDsRecords($conf['staticDS.']);
 					}
 				}
-				$submitText = $conf['staticDS.']['enable'] ? $GLOBALS['LANG']->sL('LLL:EXT:templavoila/res1/language/template_conf.xml:staticDS.wizard.submit3') : $GLOBALS['LANG']->sL('LLL:EXT:templavoila/res1/language/template_conf.xml:staticDS.wizard.submit2');
-				$controls .= '<br /><input type="hidden" name="dsWizardStep" value="1" />
-				<input type="submit" name="dsWizardDoIt" value="' . $submitText . '" />';
+				if ($this->step < 3) {
+					$submitText = $conf['staticDS.']['enable'] ? $GLOBALS['LANG']->sL('LLL:EXT:templavoila/res1/language/template_conf.xml:staticDS.wizard.submit3') : $GLOBALS['LANG']->sL('LLL:EXT:templavoila/res1/language/template_conf.xml:staticDS.wizard.submit2');
+					$controls .= '<br /><input type="hidden" name="dsWizardStep" value="1" />
+					<input type="submit" name="dsWizardDoIt" value="' . $submitText . '" />';
+				}
 			break;
 			default:
 				$controls .= '<input type="hidden" name="dsWizardStep" value="1" />
@@ -101,6 +109,7 @@
 		$writeDsIds = array();
 		$writeIds = t3lib_div::_GP('staticDSwizard');
 		$options = t3lib_div::_GP('staticDSwizardoptions');
+		$checkAll = t3lib_div::_GP('sdw-checkall');
 
 		if (count($writeIds)) {
 			$writeDsIds = array_keys($writeIds);
@@ -121,7 +130,7 @@
 				<td style="vertical-align:middle;">' . $GLOBALS['LANG']->sL('LLL:EXT:templavoila/res1/language/template_conf.xml:staticDS.wizard.usage') . '</td>
 			<td>
 				<label for="sdw-checkall">' . $GLOBALS['LANG']->sL('LLL:EXT:templavoila/res1/language/template_conf.xml:staticDS.wizard.selectall') . '</label>
-				<input type="checkbox" class="checkbox" id="sdw-checkall" onclick="$(\'staticDSwizard_getdsrecords\').select(\'tbody input[type=checkbox]\').invoke(\'setValue\', $(this).value);" /></td>
+				<input type="checkbox" class="checkbox" id="sdw-checkall" name="sdw-checkall" onclick="$$(\'.staticDScheck\').each(function(e){e.checked=$(\'sdw-checkall\').checked;});" value="1" ' . ($checkAll ? 'checked="checked"' : '') . ' /></td>
 		</tr></thead><tbody>';
 		foreach($rows as $row) {
 			$dirPath = PATH_site . ($row['scope'] == 2 ? $conf['path_fce'] : $conf['path_page']);
@@ -167,6 +176,7 @@
 						// delete DS records
 					$GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_templavoila_datastructure', 'uid=' . $row['uid'], array('deleted' => 1));
 					$updateMessage = $GLOBALS['LANG']->sL('LLL:EXT:templavoila/res1/language/template_conf.xml:staticDS.wizard.updated');
+					$this->step = 3;
 				}
 
 
@@ -180,7 +190,7 @@
 			if (count($writeDsIds) && in_array($row['uid'], $writeDsIds)) {
 				$out .= '<td class="nobr" style="text-align: right;padding: 0,3px;">written to "' . $outPath . '"</td>';
 			} else {
-				$out .= '<td class="nobr" style="text-align: right;padding: 0,3px;"><input type="checkbox" class="checkbox" name="staticDSwizard[' . $row['uid'] . ']" value="1" /></td>';
+				$out .= '<td class="nobr" style="text-align: right;padding: 0,3px;"><input type="checkbox" class="checkbox staticDScheck" name="staticDSwizard[' . $row['uid'] . ']" value="1" /></td>';
 			}
 			$out .= '</tr>';
 		}
@@ -188,7 +198,7 @@
 
 		if ($conf['enable']) {
 			if ($updateMessage) {
-				$out .= '<p>' . $updateMessage . '</p><p>' . $GLOBALS['LANG']->sL('LLL:EXT:templavoila/res1/language/template_conf.xml:staticDS.wizard.clearcache') . '</p>';
+				$out .= '<p>' . $updateMessage . '</p><p><strong>' . $GLOBALS['LANG']->sL('LLL:EXT:templavoila/res1/language/template_conf.xml:staticDS.wizard.clearcache') . '</strong></p>';
 			} else {
 				$out .= '<h4>' . $GLOBALS['LANG']->sL('LLL:EXT:templavoila/res1/language/template_conf.xml:staticDS.wizard.description2.1') . '</h4>';
 				$out .= '<p>
Index: res1/language/template_conf.xml
===================================================================
--- res1/language/template_conf.xml	(revision 29771)
+++ res1/language/template_conf.xml	(working copy)
@@ -24,7 +24,7 @@
 			<label index="staticDS.wizard.usage">Usage</label>
 			<label index="staticDS.wizard.selectall">select/deselect all</label>
 			<label index="staticDS.wizard.title.0">Check data structure paths</label>
-			<label index="staticDS.wizard.description.0">The wizard checks if the data structure paths exist and are writeable. If a path does not exist, it attempts to create the necessary directory.</label>
+			<label index="staticDS.wizard.description.0">The wizard checks if the data structure paths exist and are writeable. If a path does not exist, it attempts to create the necessary directory.&lt;br /&gt;&lt;br /&gt;If you want to update your records, ensure you checked "staticDS.enable" before starting the wizard.</label>
 			<label index="staticDS.wizard.title.1">Convert existing data structures</label>
 			<label index="staticDS.wizard.description.1">This step copies your existing data structures into static files using the specified data structure paths. Static files that already exist will be overwritten.&lt;br /&gt;Since the existing data structures remain unchanged, this is also an easy way to back up data structure records without actually using the static data structure functionality.</label>
 			<label index="staticDS.wizard.description2.1">Are you sure you want to enable static data structures? This feature is experimental and it is recommended that you perform a database backup of all tables involved (pages, tt_content, tx_templavoila_datastructure, and tx_templavoila_tmplobj) before continuing.</label>