Shout: Try again to make the buttons behave better

diff --git a/shout/templates/wizard.inc b/shout/templates/wizard.inc
index 927bb95..abb5ffe 100644 (file)
--- a/shout/templates/wizard.inc
+++ b/shout/templates/wizard.inc
@@ -1,9 +1,8 @@
 <div id="wizard">
-<form id="wizardForm" name="wizard" action="#">
 <h3 onclick="showstep('welcome')">Welcome</h3>
 <div id="welcome" class="step">
     <p>Here you will configure your new PBX.  Follow the simple instructions below, yada, yada.
-    <p><input type="submit" class="button" name="step1" onclick="showstep('step1')" value="Continue to Step 1">
+    <p><span class="button" onclick="showstep('step1')">Continue to Step 1</span></p>
 </div>
 
 <h3 onclick="showstep('step1')">Step 1: Create your company greeting</h3>
@@ -17,30 +16,41 @@
         Follow the prompts to create and save your new recording.</li>
     </ol>
     <p>When finished, hang up.</p>
-    <input type="submit" class="button" name="step2" value="Continue to Step 2" />
+    <p><span class="button" onclick="showstep('step2')">Continue to Step 2</span></p>
 </div>
 
 <h3 onclick="showstep('step2')">Step 2: Create your first extension</h3>
 <div id="step2" class="step">
-    <?php require SHOUT_TEMPLATES . '/extensions/list.inc'; ?>
-    <input type="submit" class="button" name="finished" value="Finished" />
+    <?php require SHOUT_TEMPLATES . '/extensions.inc.php'; ?>
+    <br />
+    <br />
+    <div>
+        <span class="button" onclick="showstep('finished')">
+            <?php echo Horde::img('save.png'); ?>
+            Finished
+        </span>
+    </div><br/>
 </div>
 
-<h3 onclick="showstep('finished')">Finished!</h3>
+<h3 onclick="showstep('finished')" class="step">Finished!</h3>
 <div id="finished" class="step">
-    <p>Congratulations! Your new Verendus phone system is now configured and ready to use.</p>
+    <p>Congratulations! Your new phone system is now configured and ready to use.</p>
     <p>For additional information on using these tools, we have the following resources available:</p>
     <ul>
         <li><a>Printable documentation</a></li>
         <li><a>Getting Started video</a></li>
     </ul>
     <br />
-    <input type="submit" class="button" name="continue" value="Continue to the control panel" />
+    <p><a class="button" href="dialplan.php">Continue to the control panel</a></p>
 </div>
-</form>
 </div>
 <script type="text/javascript">
 <!--
+// Show the extension add form by default
+$('addExtension').show();
+$('extensionsControls').hide();
+
+// Hide everything but the instructions
 $('step1').hide();
 $('step2').hide();
 $('finished').hide();
@@ -59,28 +69,5 @@ function showstep(e)
     Effect.BlindDown(curblock);
 }
 
-function handleClick(event)
-{
-    event.stop();
-    var clicked = event.explicitOriginalTarget.name;
-
-    switch(clicked) {
-    case 'addExtension':
-        alert('Adding an extension');
-        break;
-
-    case 'welcome':
-    case 'step1':
-    case 'step2':
-    case 'finished':
-        showstep(clicked);
-        break;
-
-    default:
-        alert("Unhandled button: " + clicked);
-    }
-}
-
-Event.observe($('wizard').down('form'), 'submit', function(event) {handleClick(event);})
 // -->
 </script>
\ No newline at end of file