moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-39813_login' of git://github.com/andyjdavis/moodle

Browse source
This commit is contained in:
Damyon Wiese 2013-07-03 11:35:53 +08:00
commit 24e13d4283
4 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lang/en/moodle.php
View file

@ -931,13 +931,13 @@ $string['log_excel_date_format'] = 'yyyy mmmm d h:mm';
$string['loggedinas'] = 'You are logged in as {$a}'; $string['loggedinas'] = 'You are logged in as {$a}';
$string['loggedinasguest'] = 'You are currently using guest access'; $string['loggedinasguest'] = 'You are currently using guest access';
$string['loggedinnot'] = 'You are not logged in.'; $string['loggedinnot'] = 'You are not logged in.';
$string['login'] = 'Login'; $string['login'] = 'Log in';
$string['loginalready'] = 'You are already logged 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['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['login_failure_logs'] = 'Login failure logs';
$string['loginguest'] = 'Login as a guest'; $string['loginguest'] = 'Log in as a guest';
$string['loginsite'] = 'Login to the site'; $string['loginsite'] = 'Log in to the site';
$string['loginsteps'] = 'Hi! For full access to courses you\'ll need to take $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. a minute to create a new account for yourself on this web site.
Each of the individual courses may also have a one-time Each of the individual courses may also have a one-time
@ -960,10 +960,9 @@ $string['loginstepsnone'] = '<p>Hi!</p>
<p>For full access to courses you\'ll need to create yourself an account.</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>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>'; <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['loginto'] = 'Log in to {$a}';
$string['loginusing'] = 'Login here using your username and password'; $string['logout'] = 'Log out';
$string['logout'] = 'Logout'; $string['logoutconfirm'] = 'Do you really want to log out?';
$string['logoutconfirm'] = 'Do you really want to logout?';
$string['logs'] = 'Logs'; $string['logs'] = 'Logs';
$string['logtoomanycourses'] = '[ <a href="{$a->url}">more</a> ]'; $string['logtoomanycourses'] = '[ <a href="{$a->url}">more</a> ]';
$string['logtoomanyusers'] = '[ <a href="{$a->url}">more</a> ]'; $string['logtoomanyusers'] = '[ <a href="{$a->url}">more</a> ]';

16
login/index_form.html
View file

@ -18,16 +18,8 @@ if (!empty($CFG->loginpasswordautocomplete)) {
<div class="skiplinks"><a class="skip" href="signup.php"><?php print_string("tocreatenewaccount"); ?></a></div> <div class="skiplinks"><a class="skip" href="signup.php"><?php print_string("tocreatenewaccount"); ?></a></div>
<?php <?php
} ?> } ?>
<h2><?php print_string("returningtosite") ?></h2> <h2><?php print_string("login") ?></h2>
<div class="subcontent loginsub"> <div class="subcontent loginsub">
<div class="desc">
<?php
print_string("loginusing");
echo '<br/>';
echo '('.get_string("cookiesenabled").')';
echo $OUTPUT->help_icon('cookiesenabled');
?>
</div>
<?php <?php
if (!empty($errormsg)) { if (!empty($errormsg)) {
echo html_writer::start_tag('div', array('class' => 'loginerrors')); echo html_writer::start_tag('div', array('class' => 'loginerrors'));
@ -59,6 +51,12 @@ if (!empty($CFG->loginpasswordautocomplete)) {
<div class="clearer"><!-- --></div> <div class="clearer"><!-- --></div>
<div class="forgetpass"><a href="forgot_password.php"><?php print_string("forgotten") ?></a></div> <div class="forgetpass"><a href="forgot_password.php"><?php print_string("forgotten") ?></a></div>
</form> </form>
<div class="desc">
<?php
echo get_string("cookiesenabled");
echo $OUTPUT->help_icon('cookiesenabled');
?>
</div>
</div> </div>
<?php if ($CFG->guestloginbutton and !isguestuser()) { ?> <?php if ($CFG->guestloginbutton and !isguestuser()) { ?>

2
theme/base/style/core.css
View file

@ -360,7 +360,7 @@ input#id_externalurl {direction:ltr;}
.loginbox.twocolumns {margin:15px;} .loginbox.twocolumns {margin:15px;}
.loginbox h2, .loginbox h2,
.loginbox .subcontent {margin:5px;padding:10px;text-align:center;} .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;} .loginbox .signuppanel .subcontent {text-align:left;}
.dir-rtl .loginbox .signuppanel .subcontent {text-align: right;} .dir-rtl .loginbox .signuppanel .subcontent {text-align: right;}
.loginbox .loginsub {margin-left:0;margin-right:0;} .loginbox .loginsub {margin-left:0;margin-right:0;}

1
theme/bootstrapbase/less/moodle/core.less
View file

@ -422,6 +422,7 @@ a.skip:active {
margin: 0; margin: 0;
padding: 0; padding: 0;
margin-bottom: 5px; margin-bottom: 5px;
margin-top:15px;
} }
.loginbox .signuppanel .subcontent { .loginbox .signuppanel .subcontent {
text-align: left; text-align: left;