From b4e27e9d6d349332988bd2961981c712c7a2d1d9 Mon Sep 17 00:00:00 2001
From: Andrew Davis <andrew@moodle.com>
Date: Mon, 17 Jun 2013 11:50:12 +0800
Subject: [PATCH 1/2] MDL-39813 dewordified the login screen

---
 lang/en/moodle.php    | 15 +++++++--------
 login/index_form.html | 16 +++++++---------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 7ec794cfa4d..564ac5e5cf5 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -934,13 +934,13 @@ $string['log_excel_date_format'] = 'yyyy mmmm d h:mm';
 $string['loggedinas'] = 'You are logged in as {$a}';
 $string['loggedinasguest'] = 'You are currently using guest access';
 $string['loggedinnot'] = 'You are not logged in.';
-$string['login'] = 'Login';
+$string['login'] = 'Log in';
 $string['loginalready'] = 'You are already logged in';
-$string['loginas'] = 'Login as';
+$string['loginas'] = 'Log in as';
 $string['loginaspasswordexplain'] = '<p>You must enter the special "loginas password" to use this feature.<br />If you do not know it, ask your server administrator.</p>';
 $string['login_failure_logs'] = 'Login failure logs';
-$string['loginguest'] = 'Login as a guest';
-$string['loginsite'] = 'Login to the site';
+$string['loginguest'] = 'Log in as a guest';
+$string['loginsite'] = 'Log in to the site';
 $string['loginsteps'] = 'Hi! For full access to courses you\'ll need to take
    a minute to create a new account for yourself on this web site.
    Each of the individual courses may also have a one-time
@@ -963,10 +963,9 @@ $string['loginstepsnone'] = '<p>Hi!</p>
 <p>For full access to courses you\'ll need to create yourself an account.</p>
 <p>All you need to do is make up a username and password and use it in the form on this page!</p>
 <p>If someone else has already chosen your username then you\'ll have to try again using a different username.</p>';
-$string['loginto'] = 'Login to {$a}';
-$string['loginusing'] = 'Login here using your username and password';
-$string['logout'] = 'Logout';
-$string['logoutconfirm'] = 'Do you really want to logout?';
+$string['loginto'] = 'Log in to {$a}';
+$string['logout'] = 'Log out';
+$string['logoutconfirm'] = 'Do you really want to log out?';
 $string['logs'] = 'Logs';
 $string['logtoomanycourses'] = '[ <a href="{$a->url}">more</a> ]';
 $string['logtoomanyusers'] = '[ <a href="{$a->url}">more</a> ]';
diff --git a/login/index_form.html b/login/index_form.html
index c5f75e826d1..8b6f1a00ff9 100644
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -18,16 +18,8 @@ if (!empty($CFG->loginpasswordautocomplete)) {
       <div class="skiplinks"><a class="skip" href="signup.php"><?php print_string("tocreatenewaccount"); ?></a></div>
 <?php
   } ?>
-    <h2><?php print_string("returningtosite") ?></h2>
+    <h2><?php print_string("login") ?></h2>
       <div class="subcontent loginsub">
-        <div class="desc">
-          <?php
-            print_string("loginusing");
-            echo '<br/>';
-            echo '('.get_string("cookiesenabled").')';
-            echo $OUTPUT->help_icon('cookiesenabled');
-           ?>
-        </div>
         <?php
           if (!empty($errormsg)) {
               echo html_writer::start_tag('div', array('class' => 'loginerrors'));
@@ -59,6 +51,12 @@ if (!empty($CFG->loginpasswordautocomplete)) {
           <div class="clearer"><!-- --></div>
           <div class="forgetpass"><a href="forgot_password.php"><?php print_string("forgotten") ?></a></div>
         </form>
+        <div class="desc">
+            <?php
+                echo get_string("cookiesenabled");
+                echo $OUTPUT->help_icon('cookiesenabled');
+            ?>
+        </div>
       </div>
 
 <?php if ($CFG->guestloginbutton and !isguestuser()) {  ?>

From 29a24edd8b83d13d244083d80ea9b97547571852 Mon Sep 17 00:00:00 2001
From: Andrew Davis <andrew@moodle.com>
Date: Wed, 3 Jul 2013 11:07:35 +0800
Subject: [PATCH 2/2] MDL-39813 added some white space above the cookie message

---
 theme/base/style/core.css                 | 2 +-
 theme/bootstrapbase/less/moodle/core.less | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index 03209de1295..6f5074e73a5 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -365,7 +365,7 @@ input#id_externalurl {direction:ltr;}
 .loginbox.twocolumns {margin:15px;}
 .loginbox h2,
 .loginbox .subcontent {margin:5px;padding:10px;text-align:center;}
-.loginbox .loginpanel .desc {margin:0;padding:0;margin-bottom:5px;}
+.loginbox .loginpanel .desc {margin:0;padding:0;margin-bottom:5px;margin-top:15px;}
 .loginbox .signuppanel .subcontent {text-align:left;}
 .dir-rtl .loginbox .signuppanel .subcontent {text-align: right;}
 .loginbox .loginsub {margin-left:0;margin-right:0;}
diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
index 7b34db3eaa3..d067a1384df 100644
--- a/theme/bootstrapbase/less/moodle/core.less
+++ b/theme/bootstrapbase/less/moodle/core.less
@@ -418,6 +418,7 @@ a.skip:active {
     margin: 0;
     padding: 0;
     margin-bottom: 5px;
+    margin-top:15px;
 }
 .loginbox .signuppanel .subcontent {
     text-align: left;