diff options
-rw-r--r-- | languages/en.php | 14 | ||||
-rw-r--r-- | views/failsafe/messages/errors/list.php | 2 | ||||
-rw-r--r-- | views/failsafe/messages/exceptions/exception.php | 6 | ||||
-rw-r--r-- | views/failsafe/messages/sanitisation/settings.php | 40 | ||||
-rw-r--r-- | views/failsafe/pageshells/pageshell.php | 97 |
5 files changed, 128 insertions, 31 deletions
diff --git a/languages/en.php b/languages/en.php index a2d6d7d46..14b567662 100644 --- a/languages/en.php +++ b/languages/en.php @@ -17,7 +17,7 @@ /**
* Errors
*/
- 'exception:title' => "We've encountered a problem.",
+ 'exception:title' => "Welcome to Elgg.",
'InstallationException:CantCreateSite' => "Unable to create a default ElggSite with credentials Name:%s, Url: %s",
@@ -131,7 +131,7 @@ 'APIException:MissingContentType' => "Missing content type for post data",
'SecurityException:InvalidPostHash' => "POST data hash is invalid - Expected %s but got %s.",
'SecurityException:DupePacket' => "Packet signature already seen.",
- 'SecurityException:InvalidAPIKey' => "Invalid or missing API Key.", + 'SecurityException:InvalidAPIKey' => "Invalid or missing API Key.",
'NotImplementedException:CallMethodNotImplemented' => "Call method '%s' is currently not supported.",
'NotImplementedException:XMLRPCMethodNotImplemented' => "XML-RPC method call '%s' not implemented.",
@@ -398,8 +398,8 @@ 'description' => "Description",
'tags' => "Tags",
'spotlight' => "Spotlight",
- 'all' => "All", - + 'all' => "All",
+
'by' => 'by',
/**
@@ -479,15 +479,15 @@ Alternatively, you can enter your database settings below and we will try and do 'installation:settings:dbwizard:savefail' => "We were unable to save the new settings.php. Please save the following file as engine/settings.php using a text editor.",
- 'sitename' => "The name of your site (eg \"My social networking site\"):", + 'sitename' => "The name of your site (eg \"My social networking site\"):",
'sitedescription' => "Short description of your site (optional)",
'wwwroot' => "The site URL, followed by a trailing slash:",
'path' => "The full path to your site root on your disk, followed by a trailing slash:",
'dataroot' => "The full path to the directory where uploaded files will be stored, followed by a trailing slash:",
'language' => "The default language for your site:",
'debug' => "Debug mode provides extra information which can be used to diagnose faults, however it can slow your system down so should only be used if you are having problems:",
- 'debug:label' => "Turn on debug mode", - 'usage' => "This option lets Elgg send anonymous usage statistics back to Curverider.", + 'debug:label' => "Turn on debug mode",
+ 'usage' => "This option lets Elgg send anonymous usage statistics back to Curverider.",
'usage:label' => "Send anonymous usage statistics",
'view' => "Enter the view which will be used as the default for your site (e.g. 'mobile') or leave this blank for the default view:",
diff --git a/views/failsafe/messages/errors/list.php b/views/failsafe/messages/errors/list.php index ff43f1d00..1f556fa4d 100644 --- a/views/failsafe/messages/errors/list.php +++ b/views/failsafe/messages/errors/list.php @@ -24,7 +24,7 @@ <?php
foreach($vars['object'] as $error) {
echo elgg_view('messages/errors/error',array('object' => $error)); - echo "<hr />";
+ //echo "<hr />";
}
?>
</div>
diff --git a/views/failsafe/messages/exceptions/exception.php b/views/failsafe/messages/exceptions/exception.php index 0b280107f..61c4a8937 100644 --- a/views/failsafe/messages/exceptions/exception.php +++ b/views/failsafe/messages/exceptions/exception.php @@ -17,7 +17,7 @@ global $CONFIG; ?> - <p class="messages-exception"> + <p class="messages-exception" style="background:#FDFFC3;display:block;padding:10px;"> <span title="<?php echo get_class($vars['object']); ?>"> <?php @@ -28,8 +28,8 @@ </p> <?php if ($CONFIG->debug) { ?> - <hr /> - <p class="messages-exception-detail"> + <!-- <hr /> --> + <p class="messages-exception-detail" style="background:#FDFFC3;display:block;padding:10px;"> <?php echo autop(htmlentities(print_r($vars['object'], true))); diff --git a/views/failsafe/messages/sanitisation/settings.php b/views/failsafe/messages/sanitisation/settings.php index e4ea720a8..f56d6b22c 100644 --- a/views/failsafe/messages/sanitisation/settings.php +++ b/views/failsafe/messages/sanitisation/settings.php @@ -1,16 +1,16 @@ -<?php
-
- /**
- * Elgg settings not found message
- * Is saved to the errors register when settings.php cannot be found
- *
- * @package Elgg
- * @subpackage Core
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008
- * @link http://elgg.org/
- */
+<?php + + /** + * Elgg settings not found message + * Is saved to the errors register when settings.php cannot be found + * + * @package Elgg + * @subpackage Core + * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 + * @author Curverider Ltd + * @copyright Curverider Ltd 2008 + * @link http://elgg.org/ + */ if ($vars['settings.php']) { @@ -24,17 +24,17 @@ else { - echo autop(elgg_echo('installation:error:settings'));
+ echo autop(elgg_echo('installation:error:settings')); ?> <div> <h2><?php echo elgg_echo('installation:settings:dbwizard:prompt'); ?></h2> <form method="POST"> - <table> - <tr><td width="200" valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:user'); ?></td><td valign="top"> <input type="text" name="db_install_vars[CONFIG_DBUSER]" /></td></tr> - <tr><td width="200" valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:pass'); ?></td><td valign="top"> <input type="password" name="db_install_vars[CONFIG_DBPASS]" /></td></tr> - <tr><td width="200" valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:dbname'); ?></td><td valign="top"> <input type="text" name="db_install_vars[CONFIG_DBNAME]" /></td></tr> - <tr><td width="200" valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:host'); ?></td><td valign="top"> <input type="text" name="db_install_vars[CONFIG_DBHOST]" value="localhost" /></td></tr> - <tr><td width="200" valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:prefix'); ?></td><td valign="top"> <input type="text" name="db_install_vars[CONFIG_DBPREFIX]" value="elgg" /></td></tr> + <table cellpadding="0" cellspacing="10" style="background:#f1f1f1;"> + <tr><td valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:user'); ?></td><td valign="top"> <input type="text" name="db_install_vars[CONFIG_DBUSER]" /></td></tr> + <tr><td valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:pass'); ?></td><td valign="top"> <input type="password" name="db_install_vars[CONFIG_DBPASS]" /></td></tr> + <tr><td valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:dbname'); ?></td><td valign="top"> <input type="text" name="db_install_vars[CONFIG_DBNAME]" /></td></tr> + <tr><td valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:host'); ?></td><td valign="top"> <input type="text" name="db_install_vars[CONFIG_DBHOST]" value="localhost" /></td></tr> + <tr><td valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:prefix'); ?></td><td valign="top"> <input type="text" name="db_install_vars[CONFIG_DBPREFIX]" value="elgg" /></td></tr> </table> <input type="submit" name="<?php echo elgg_echo('save'); ?>" value="<?php echo elgg_echo('save'); ?>" /> diff --git a/views/failsafe/pageshells/pageshell.php b/views/failsafe/pageshells/pageshell.php index 7e1de7c10..1562173e1 100644 --- a/views/failsafe/pageshells/pageshell.php +++ b/views/failsafe/pageshells/pageshell.php @@ -22,8 +22,104 @@ <html> <head> <title><?php echo $vars['title']; ?></title> + + <style type="text/css"> + + body { + text-align:left; + margin:0; + padding:0; + background: #4690d6; + font: 80%/1.5 "Lucida Grande", Verdana, sans-serif; + color: #333333; + } + a { + color: #4690d6; + text-decoration: none; + -moz-outline-style: none; + outline: none; + } + a:visited { + color: #0054a7; + } + a:hover { + color: #0054a7; + text-decoration: underline; + } + p { + margin: 0px 0px 15px 0; + } + img { + border: none; + } + #startpage_wrapper { + background:white; + width:570px; + margin:auto; + padding:10px 40px; + margin-bottom:40px; + margin-top:20px; + border-right: 1px solid #666666; + border-bottom: 1px solid #666666; + } + + label { + font-weight: bold; + color:#333333; + font-size: 140%; + } + input { + font: 120% Arial, Helvetica, sans-serif; + padding: 5px; + border: 1px solid #cccccc; + color:#666666; + } + textarea { + font: 120% Arial, Helvetica, sans-serif; + border: solid 1px #cccccc; + padding: 5px; + color:#666666; + } + textarea:focus, input[type="password"]:focus, input[type="text"]:focus { + border: solid 1px #4690d6; + background: #e4ecf5; + color:#333333; + } + + input[type="submit"]:hover { + background: #0054a7; + border: 4px solid #0054a7; + } + + input[type="submit"] { + font: 16px/100% Arial, Helvetica, sans-serif; + font-weight: bold; + color: #ffffff; + background:#4690d6; + border: 4px solid #4690d6; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + width: auto; + height: 35px; + padding: 2px 6px 2px 6px; + margin:10px 0 10px 0; + cursor: pointer; + } + #startpage_wrapper hr { + border:0; + border-bottom:1px solid #333333; + } + #startpage_wrapper td { + text-align: left; + vertical-align: middle; + } + </style> + + + </head> <body> + <div id="startpage_wrapper"> <h1><?php echo $vars['title']; ?></h1> <!-- display any system messages --> @@ -32,5 +128,6 @@ <p> <?php echo $vars['body']; ?> </p> + </div> </body> </html>
\ No newline at end of file |