From: Ben Klang Date: Fri, 2 Apr 2010 16:49:34 +0000 (-0400) Subject: Shout: Continue working on first-run wizard X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=81e4057e8ba8847326b66043631962a519c8f873;p=horde.git Shout: Continue working on first-run wizard Start working on merging extensions editor with wizard. --- diff --git a/shout/templates/extensions/list.inc b/shout/templates/extensions/list.inc index a0cc0424b..920713ee5 100644 --- a/shout/templates/extensions/list.inc +++ b/shout/templates/extensions/list.inc @@ -43,12 +43,53 @@ $addurl = Horde::applicationUrl('extensions.php'); $addurl = Horde_Util::addParameter($addurl, 'action', 'add'); ?> -
  • +
  •  New Extension
    • +
    +
    Add Extension
    + + + + + + + + + + + + + + + + + +
    + * Full Name + + +
    + * Extension + + +
    + * E-Mail Address + + +
    + * PIN + + +
    +
    + +
    +
    + \ No newline at end of file diff --git a/shout/themes/screen.css b/shout/themes/screen.css index cd299013c..a1f80b490 100644 --- a/shout/themes/screen.css +++ b/shout/themes/screen.css @@ -224,12 +224,13 @@ div#wizard h3 border-top-right-radius: 5px; padding: 5px; display: block; + width: 500px; } .step { width: 500px; border: 1px dotted; - margin: 5px; + margin: 0px 5px; padding: 5px; } diff --git a/shout/wizard.php b/shout/wizard.php index 93b47fa5e..4f5250e54 100644 --- a/shout/wizard.php +++ b/shout/wizard.php @@ -18,40 +18,40 @@ try { $curaccount = $_SESSION['shout']['curaccount']; $menus = $shout->storage->getMenus($curaccount['code']); - if (!empty($menus) && !empty($menus[Shout::MAIN_MENU])) { - header('Location: ' . Horde::applicationUrl('dialplan.php', true)); - exit; - } - - // Create the default recording for the main menu - try { - $recording = $shout->storage->getRecordingByName($curaccount['code'], - Shout::MAIN_RECORDING); - } catch (Shout_Exception $e) { - $shout->storage->addRecording($curaccount['code'], Shout::MAIN_RECORDING); - $recording = $shout->storage->getRecordingByName($curaccount['code'], - Shout::MAIN_RECORDING); - } - - // Create a default main menu - $details = array( - 'name' => Shout::MAIN_MENU, - 'description' => _("Main menu: what your callers will hear."), - 'recording_id' => $recording['id'] - ); - $shout->dialplan->saveMenuInfo($curaccount['code'], $details); - // Populate the default option, granting the ability to log into the admin - // section. - $shout->dialplan->saveMenuAction($curaccount['code'], Shout::MAIN_MENU, - 'star', 'admin_login', array()); - - $vars = Horde_Variables::getDefaultVariables(); - $extensionform = new ExtensionDetailsForm($vars); +// if (!empty($menus) && !empty($menus[Shout::MAIN_MENU])) { +// header('Location: ' . Horde::applicationUrl('dialplan.php', true)); +// exit; +// } +// +// // Create the default recording for the main menu +// try { +// $recording = $shout->storage->getRecordingByName($curaccount['code'], +// Shout::MAIN_RECORDING); +// } catch (Shout_Exception $e) { +// $shout->storage->addRecording($curaccount['code'], Shout::MAIN_RECORDING); +// $recording = $shout->storage->getRecordingByName($curaccount['code'], +// Shout::MAIN_RECORDING); +// } +// +// // Create a default main menu +// $details = array( +// 'name' => Shout::MAIN_MENU, +// 'description' => _("Main menu: what your callers will hear."), +// 'recording_id' => $recording['id'] +// ); +// $shout->dialplan->saveMenuInfo($curaccount['code'], $details); +// // Populate the default option, granting the ability to log into the admin +// // section. +// $shout->dialplan->saveMenuAction($curaccount['code'], Shout::MAIN_MENU, +// 'star', 'admin_login', array()); + $extensions = $shout->extensions->getExtensions($curaccount['code']); } catch (Exception $e) { $notification->push($e); } Horde::addScriptFile('prototype.js', 'horde'); +Horde::addScriptFile('scriptaculous.js', 'horde'); +Horde::addScriptFile('stripe.js', 'horde'); require SHOUT_TEMPLATES . '/common-header.inc'; require SHOUT_TEMPLATES . '/menu.inc';