do not allow pcu-add if model is unspecified

[www-register-wizard.git] / application / views / stage8_rebootpcu.php

diff --git a/application/views/stage8_rebootpcu.php b/application/views/stage8_rebootpcu.php
index 7998e54..79981a8 100644 (file)
--- a/application/views/stage8_rebootpcu.php
+++ b/application/views/stage8_rebootpcu.php
@@ -11,13 +11,7 @@
                        </span>
                </dd>
        <?php elseif ( $node['boot_state'] == "rins" || $node['boot_state'] == "reinstall" ): ?>
-       <dt>If Reboot succeeds,</dt><dd>
-                       your machine will reboot, install the bootstrap image, and 
-                       contacted PLC.  Finally, the boot state will be updated to 'boot'.
-                       <br>
-                       Continue using the 'Reload' button to check whether the node has
-                       completed its installation.
-       </dd>
+<?php if ( isset($error) && ! empty($error) ): ?>
        <dt>If Reboot fails,</dt><dd>
                        there will be an error displayed that will assist you in
                        diagnosing the error.  Otherwise, please double check the
@@ -25,7 +19,25 @@
                        PCU manually (using it's web or ssh interface).
                        <br>
                        To try the test again, use 'Test Reboot'.<br>
+                       If you need help diagnosing the problem, please contact 
+                       <a href="mailto:support@planet-lab.org?subject=Reboot Failed: <?= $error ?>">PlanetLab Support</a>.
        </dd>
+               <dt> <span class='error'> Reboot Failure: </span> </dt>
+               <dd> <span class='error'> <?= $error ?> </span> </dd>
+       <?php else: ?>
+       <dt>If Reboot succeeds,</dt><dd>
+                       your machine will reboot, install the bootstrap image, and 
+                       contacted PLC.  Finally, the boot state will be updated to 'boot'.
+                       <br>
+                       Continue using the 'Reload' button to check whether the node has
+                       completed its installation.
+       </dd>
+               <dt> Reboot without error: </dt>
+               <dd> No errors were reported for your reboot.  Please double check by
+               confirming at the console.  If the reboot failed, please report this
+               to <a href="mailto:support@planet-lab.org?subject=No error for failed PCU reboot">PlanetLab Feedback</a>.
+               </dd>
+<?php endif; ?>
        <?php else: ?>
        <dt><b>Success!!</b></dt><dd>
                        The installation is complete; your machine has reached the final
@@ -52,13 +64,6 @@
        <tr><th>Model: </th><td><?= $node['model'] ?></td></tr>
        <tr><th>Version: </th><td nowrap='1'><?= $node['version'] ?></td></tr>
        <tr><th>Last Contact: </th><td><?= $last_contact_str ?></td></tr>
-<?php if ( isset($error) && ! empty($error) ): ?>
-       <tr>
-               <td colspan=2>
-                       <span class='error'> <?= $error ?> </span>
-               </td>
-       </tr>
-<?php endif; ?>
        <tr>
                <td>
                </td>