2 files changed, 13 insertions, 7 deletions

diff --git a/frontend/pages/configurations/manager.php b/frontend/pages/configurations/manager.php
index 148a470..68297fe 100644
--- a/frontend/pages/configurations/manager.php
+++ b/frontend/pages/configurations/manager.php
@@ -44,10 +44,11 @@ function body_configurations_manager() {
 		if ($c->status > 0) {
 			echo '<a href="'.url("config/$c->id")."\">Step $c->status</a>";
 		} elseif ($c->status == 0) {
-			echo '<b>Ready</b> (<a href="'.url("config/$c->id/status").'">modify</a>)';
+			echo '<b>Ready</b>';
 		} else {
 			echo $c->status;
 		}
+		echo ' (<a href="'.url("config/$c->id/status").'">view</a>)';
 		echo '</td><td>'.$c->summary().'</td><td>';
 		$builds=$c->get_builds();
 		if ($builds) {
diff --git a/frontend/pages/configurations/status.php b/frontend/pages/configurations/status.php
index ebeeab3..d27efd4 100644
--- a/frontend/pages/configurations/status.php
+++ b/frontend/pages/configurations/status.php
@@ -24,12 +24,11 @@ function body_configurations_status() {
 	$status=true;
 	$good=0;
 	for ($i=1; $i<=$module->numsteps; $i++) {
-		$r[$i]='<li>';
-		$step=new wizard_step($c, $i, !$status);
-		$r[$i].=($status?'<a href="'.url("config/$c->id/$i")."\">$step->title</a>":$step->title);
+		$steps[$i]=new wizard_step($c, $i, !$status);
+		$r[$i]=($status?'<a href="'.url("config/$c->id/$i")."\">{$steps[$i]->title}</a>":$steps[$i]->title);
 		if ($status) {
 			$r[$i].=' - ';
-			$good+=($status=$step->verify())?1:0;
+			$good+=($status=$steps[$i]->verify())?1:0;
 			if ($status === null)
 				$r[$i].='<span style="color: yellow; background-color: black">Incomplete</span>';
 			elseif ($status)
@@ -37,10 +36,16 @@ function body_configurations_status() {
 			else
 				$r[$i].='<span style="color: red">INVALID</span>';
 		}
-		$r[$i].='</li>';
 	}
 	echo '<h3>'.($c->name?htmlentities($c->name):$c->id).": $good of $module->numsteps steps complete</h3>\n";
-	echo '<ol>'.implode('', $r).'</ol>';
+	echo '<ol>';
+	foreach ($steps as $i => $step) {
+		echo '<li>';
+		echo $r[$i];
+		$step->output(false);
+		echo '</li>';
+	}
+	echo '</ol>';
 	if ($good < $module->numsteps)
 		echo '<a href="'.url("config/$c->id/".($good+1)).'">Finish configuration</a>';
 }