Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'MDL-27793_m22' of git://github.com/nebgor/moodle into M…

…OODLE_22_STABLE
  • Loading branch information...
commit e61fabb720bc6a01e775a1bacfbed0ad41cb475b 2 parents 845b165 + f356ebc
@stronk7 stronk7 authored
View
8 login/index_form.html
@@ -47,12 +47,14 @@
<input type="password" name="password" id="password" size="15" value="" <?php echo $autocomplete; ?> />
<input type="submit" id="loginbtn" value="<?php print_string("login") ?>" />
</div>
+ </div>
<div class="clearer"><!-- --></div>
<?php if (isset($CFG->rememberusername) and $CFG->rememberusername == 2) { ?>
- <div class="form-label"><input type="checkbox" name="rememberusername" id="rememberusername" value="1" <?php if ($frm->username) {echo 'checked="checked"';} ?> /></div>
- <div class="form-input"><label for="rememberusername"><?php print_string('rememberusername', 'admin') ?></label></div>
+ <div class="rememberpass">
+ <input type="checkbox" name="rememberusername" id="rememberusername" value="1" <?php if ($frm->username) {echo 'checked="checked"';} ?> />
+ <label for="rememberusername"><?php print_string('rememberusername', 'admin') ?></label>
+ </div>
<?php } ?>
- </div>
<div class="clearer"><!-- --></div>
<div class="forgetpass"><a href="forgot_password.php"><?php print_string("forgotten") ?></a></div>
</form>
View
5 theme/afterburner/style/afterburner_styles.css
@@ -253,6 +253,11 @@ Course Section Topic & Weekly
display: none; /* hides topic items title or weekly itens title */
margin-bottom: 9px;
}
+/*Login (Login page)*/
+.loginbox .loginform .form-label {width:46%;}
+.dir-rtl .loginbox .loginform .form-label {width:46%;}
+.loginbox .loginform .form-input {width:53%;}
+
/*
Login (Front Page)
-----------------------*/
View
7 theme/anomaly/style/general.css
@@ -190,6 +190,11 @@ h1.headermain {
float: left;
text-align: right;
}
+.dir-ltr .loginbox .loginform .form-label {
+ width: 39%;
+ float: left;
+ text-align: right;
+}
.loginbox .loginform .form-input {
width: 60%;
@@ -835,4 +840,4 @@ h1.headermain {
/* Add Block
-------------------------*/
-.block .content .singleselect form#add_block .select.menubui_addblock { width: 160px;}
+.block .content .singleselect form#add_block .select.menubui_addblock { width: 160px;}
View
7 theme/base/style/core.css
@@ -272,7 +272,7 @@ input#id_externalurl {direction:ltr;}
/**
* Login
*/
-.loginbox {margin:15px;overflow:hidden;}
+.loginbox {margin:15px;overflow:visible;}
.loginbox.twocolumns {margin:15px;}
.loginbox h2,
.loginbox .subcontent {margin:5px;padding:10px;text-align:center;}
@@ -285,8 +285,9 @@ input#id_externalurl {direction:ltr;}
.loginbox .potentialidps .potentialidplist {margin-left:40%;}
.loginbox .potentialidps .potentialidplist div {text-align:left;}
.loginbox .loginform {margin-top:1em;text-align:left;}
-.loginbox .loginform .form-label {float:left;text-align:right;width:40%;}
-.loginbox .loginform .form-input {float:right;width:59%;}
+.loginbox .loginform .form-label {float:left;text-align:right;width:44%;direction:rtl; white-space:nowrap;}
+.dir-rtl .loginbox .loginform .form-label {float:left;text-align:right;width:44%;direction:ltr; white-space:nowrap;}
+.loginbox .loginform .form-input {float:right;width:55%;}
.loginbox .loginform .form-input input {width: 6em;}
.loginbox .signupform {margin-top:1em;text-align:center;}
.loginbox.twocolumns .loginpanel {float:left;width:49.5%;border-right: 1px solid;margin-bottom:-2000px;padding-bottom:2000px;}
View
5 theme/formal_white/style/core.css
@@ -111,6 +111,8 @@ input[type="radio"] {
}
.loginbox .loginform .form-label {
+ float: none;
+ width: 100%;
margin: 0 auto;
float: left;
text-align: right;
@@ -118,6 +120,9 @@ input[type="radio"] {
}
.dir-rtl .loginbox .loginform .form-label {
+ float: none;
+ width: 100%;
+ margin: 0 auto;
text-align: right;
}
Please sign in to comment.
Something went wrong with that request. Please try again.