Updates to WalledGarden login. Lost password text simplified/shortened, text spacing...

git-svn-id: http://code.elgg.org/elgg/trunk@5867 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/languages/en.php b/languages/en.php
index bb57d2b16790d4df4d0543ddcbebc3b2c0835009..aab05c8f4a041e4abc923a35751d7011958bd5bb 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -426,7 +426,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
        'user:password:resetreq:success' => 'Successfully requested a new password, email sent',
        'user:password:resetreq:fail' => 'Could not request a new password.',
 
-       'user:password:text' => 'To generate a new password, enter your username below. We will send the address of a unique verification page to you via email click on the link in the body of the message and a new password will be sent to you.',
+       'user:password:text' => 'To request a new password, enter your username below and click the Request button.',
 
        'user:persistent' => 'Remember me',
 /**

diff --git a/mod/walledgarden/views/default/account/forms/login.php b/mod/walledgarden/views/default/account/forms/login.php
index 1c3bbe51263fc382036a15a31f1173529ceb3712..8d04b5b8d453a40addfd52d7576e3f609a56c4fd 100644 (file)
--- a/mod/walledgarden/views/default/account/forms/login.php
+++ b/mod/walledgarden/views/default/account/forms/login.php
@@ -28,7 +28,7 @@ if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
 <div class="lostpassword_form margin_top hidden">\r
        <?php\r
        $lostpassword_form_body = "<p>" . elgg_echo('user:password:text') . "</p>";\r
-       $lostpassword_form_body .= "<p><label>". elgg_echo('username') . " "\r
+       $lostpassword_form_body .= "<p class='margin_none'><label>". elgg_echo('username') . " "\r
                . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea lostusername')) . "</label></p>";\r
        $lostpassword_form_body .= elgg_view('input/captcha');\r
        $lostpassword_form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "</p>";\r

diff --git a/mod/walledgarden/views/default/page_shells/walled_garden_index.php b/mod/walledgarden/views/default/page_shells/walled_garden_index.php
index 12b58c7da18efb3ebea32a3e955097054ee95115..d160161a7508979882bf51f7adb6f8ef7d8cbbf5 100644 (file)
--- a/mod/walledgarden/views/default/page_shells/walled_garden_index.php
+++ b/mod/walledgarden/views/default/page_shells/walled_garden_index.php
@@ -25,7 +25,11 @@ if (empty($vars['title'])) {
 } else {\r
        $title = $vars['config']->sitename . ": " . $vars['title'];\r
 }\r
-\r
+?>\r
+<style type="text/css">\r
+       body {background:white !important;}\r
+</style>\r
+<?php\r
 echo elgg_view('page_elements/html_begin', $vars);\r
 echo "<div id='walledgarden_sysmessages'>".elgg_view('messages/list', array('object' => $vars['sysmessages']))."</div>";\r
        \r