diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2008-11-02 21:12:15 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2008-11-02 21:12:15 +0000 |
| commit | 231117b4a3b622df91a5a3234cb97c2fe94cd180 (patch) | |
| tree | 4004b5e020c4c3bea2293bcfcf1a354b637b6d38 /core/views | |
| parent | 3f21b08e5f7d0a44e69d70ca15286899c598f5eb (diff) | |
Change this to be inline instead of an iframe, and fix it up so that
it walks you through creating the database also.
Diffstat (limited to 'core/views')
| -rw-r--r-- | core/views/welcome.html.php | 18 | ||||
| -rw-r--r-- | core/views/welcome_syscheck.html.php | 67 |
2 files changed, 35 insertions, 50 deletions
diff --git a/core/views/welcome.html.php b/core/views/welcome.html.php index a22bb324..9b77ce20 100644 --- a/core/views/welcome.html.php +++ b/core/views/welcome.html.php @@ -21,6 +21,10 @@ margin: 0px; } + h1, h2, h3 { + margin-bottom: .1em; + } + p { margin: 0 0 0 0; padding-left: 1em; @@ -35,6 +39,14 @@ color: red; } + .success { + color: green; + } + + p.success { + font-weight: bold; + } + div.block { padding: 0px; margin: 0px; @@ -42,7 +54,7 @@ } ul { - margin-top: -1em; + margin-top: -.25em; } </style> </head> @@ -69,8 +81,8 @@ links to get you started. </p> - <h2>About your config</h2> - <iframe width="100%" src="<?= url::site("welcome/syscheck") ?>"/></iframe> + <h2>System Configuration</h2> + <?= $syscheck ?> <h2>Activities</h2> <p> diff --git a/core/views/welcome_syscheck.html.php b/core/views/welcome_syscheck.html.php index c87c4763..3a6b352c 100644 --- a/core/views/welcome_syscheck.html.php +++ b/core/views/welcome_syscheck.html.php @@ -1,49 +1,22 @@ <? defined("SYSPATH") or die("No direct script access."); ?> -<html> - <head> - <title>Gallery3 Scaffold</title> - <style> - body { - font-family: Trebuchet MS; - } +<? foreach ($errors as $error): ?> +<div class="block"> + <p class="error"> + <?= $error->message ?> + </p> + <? foreach ($error->instructions as $line): ?> + <pre><?= $line ?></pre> + <? endforeach ?> - p { - margin: 0 0 0 0; - padding: 5px; - } - - pre { - margin: 0; - padding-left: 1em; - } - - .error { - color: red; - } - - div.block { - border: 1px solid black; - margin-bottom: 5px; - paddding: 1em; - } - </style> - </head> - <body> - <? foreach ($errors as $error): ?> - <div class="block"> - <p class="error"> - <?= $error->message ?> - </p> - <? foreach ($error->instructions as $line): ?> - <pre><?= $line ?></pre> - <? endforeach ?> - - <? if (!empty($error->message2)): ?> - <p class="error"> - <?= $error->message2 ?> - </p> - <? endif ?> - </div> - <? endforeach ?> - </body> -</html> + <? if (!empty($error->message2)): ?> + <p class="error"> + <?= $error->message2 ?> + </p> + <? endif ?> +</div> +<? endforeach ?> +<? if (empty($errors)): ?> +<p class="success"> + Your system is ready to go. +</p> +<? endif ?> |