Shout: keep working on first-run wizard

diff --git a/shout/templates/dialplan/add.inc b/shout/templates/dialplan/add.inc
index 9763d36..112bd7d 100644 (file)
--- a/shout/templates/dialplan/add.inc
+++ b/shout/templates/dialplan/add.inc
@@ -1,2 +1,2 @@
 <?php
-$Form->renderActive($RENDERER, $vars, Horde::applicationUrl('dialplan.php'), 'post');
+$Form->renderActive(null, $vars, Horde::applicationUrl('dialplan.php'), 'post');

diff --git a/shout/templates/wizard.inc b/shout/templates/wizard.inc
index a761bd8..d007e7a 100644 (file)
--- a/shout/templates/wizard.inc
+++ b/shout/templates/wizard.inc
@@ -9,9 +9,15 @@
         Follow the prompts to create and save your new recording.</li>
     </ol>
     When finished, hang up.
-    <input type="cancel" onclick="shownext()" value="Continue to Step 2">
+    <br style="clear:both;">
+    <div class="button" onclick="$('step2').show()">Continue to Step 2</div>
 </div>
-
+<br style="clear:both;">
 <div id="step2" class="step">
-    Here we create an extension.
-</div>
\ No newline at end of file
+    <?php $extensionform->renderActive(null, $vars, Horde::applicationUrl('dialplan.php'), 'post');?>
+</div>
+<script type="text/javascript">
+<!--
+$('step2').hide();
+// -->
+</script>
\ No newline at end of file

diff --git a/shout/themes/screen.css b/shout/themes/screen.css
index 0e1512a..05b989b 100644 (file)
--- a/shout/themes/screen.css
+++ b/shout/themes/screen.css
@@ -214,3 +214,11 @@ span.device:hover
     background: url('graphics/redbox_spinner.gif') no-repeat center #000;
     z-index: 5;
 }
+
+.step
+{
+    width: 500px;
+    border: 1px dotted;
+    margin: 5px;
+    padding: 5px;
+}

diff --git a/shout/wizard.php b/shout/wizard.php
index d5ef427..93b47fa 100644 (file)
--- a/shout/wizard.php
+++ b/shout/wizard.php
@@ -11,6 +11,8 @@
 require_once dirname(__FILE__) . '/lib/Application.php';
 $shout = Horde_Registry::appInit('shout');
 
+require_once SHOUT_BASE . '/lib/Forms/ExtensionForm.php';
+
 try {
     // Only continue if there is no existing "Main Menu"
     $curaccount = $_SESSION['shout']['curaccount'];
@@ -43,7 +45,8 @@ try {
     $shout->dialplan->saveMenuAction($curaccount['code'], Shout::MAIN_MENU,
                                      'star', 'admin_login', array());
 
-    
+    $vars = Horde_Variables::getDefaultVariables();
+    $extensionform = new ExtensionDetailsForm($vars);
 } catch (Exception $e) {
     $notification->push($e);
 }