MDL-7861 xhtml strict fixes - login page - ok, one even more final cleanup ;-)

diff --git a/login/index_form.html b/login/index_form.html
index 1bd9e3a98d1c02b04b5990935255137b23390777..379e1c1b9ce69e3a0a4069efebc78c67356ed21b 100644 (file)
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -5,8 +5,8 @@ if ($show_instructions) {
     $columns = 'onecolumn';
 }
 ?>
-<div class="loginbox"><div class="content">
-  <div class="<?php echo $columns ?>">
+<div class="loginbox"><div class="<?php echo $columns ?>">
+  <div class="content">
     <div class="loginpanel">
      <div class="divider">
       <div class="header"><h2><?php print_string("returningtosite") ?></h2></div>
@@ -32,7 +32,7 @@ if ($show_instructions) {
           <div class="loginform">
             <div class="form-label"><label for="username"><?php print_string("username") ?></label></div>
             <div class="form-input">
-              <input type="text" name="username" id="username" size="15" value="<?php p($frm->username) ?>" /> 
+              <input type="text" name="username" id="username" size="15" value="<?php p($frm->username) ?>" />
             </div>
             <div class="clearer"><!-- --></div>
             <div class="form-label"><label for="password"><?php print_string("password") ?></label></div>
@@ -48,7 +48,9 @@ if ($show_instructions) {
 
 <?php if ($CFG->guestloginbutton) {  ?>
       <div class="subcontent guestsub">
-        <?php print_string("someallowguest") ?>
+        <div class="desc">
+          <?php print_string("someallowguest") ?>
+        </div>
         <form action="index.php" method="post" id="guestlogin">
           <div class="guestform">
             <input type="hidden" name="username" value="guest" />
@@ -61,9 +63,11 @@ if ($show_instructions) {
 <?php } ?>
 
       <div class="subcontent forgotsub">
-        <?php print_string("forgotten") ?> 
+        <div class="desc">
+          <?php print_string("forgotten") ?>
+        </div>
         <form action="forgot_password.php" method="post" id="changepassword">
-          <div class="forgottenform">
+          <div class="forgotform">
             <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
             <input type="submit" value="<?php print_string("passwordrecovery") ?>" />
           </div>

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 79a29e7e104463e18abfe864a2fdb976dafaed31..cb699e7d9b3e0c5a3a8fb216238fe4175b64e794 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -1442,24 +1442,40 @@ body#grade-index .grades .weighted {
 
 .loginbox {
   margin-top:15px;
+  margin-bottom:15px;
 }
 
 .loginbox .content {
   border:1px solid;
+  width:50%;
+  margin-left:25%;
+  overflow:hidden;
+}
+
+.loginbox .twocolumns .content {
   width:90%;
   margin-left:5%;
-  overflow:hidden;
 }
 
-.loginbox .content .header h2 {
+.loginbox .content .header h2,
+.loginbox .content .subcontent {
   margin:5px;
   padding:10px;
   text-align:center;
 }
 
-.loginbox .content .subcontent {
-  margin:5px;
-  padding:10px;
+.loginbox .content .loginpanel .subcontent {
+  text-align:center;
+}
+
+.loginbox .content .loginpanel .desc {
+  margin:0px;
+  padding:0px;
+  margin-bottom:5px;
+}
+
+.loginbox .content .signuppanel .subcontent {
+  text-align:left;
 }
 
 .loginbox .content .loginsub {
@@ -1467,22 +1483,12 @@ body#grade-index .grades .weighted {
   margin-right:0%;
 }
 
-.loginbox .content .guestsub {
-  border-top:1px solid;
-  margin-top:1.5em;
-  margin-left:12%;
-  margin-right:12%;
-}
-
+.loginbox .content .guestsub,
 .loginbox .content .forgotsub {
   border-top:1px solid;
-  margin-top:1.5em;
   margin-left:12%;
   margin-right:12%;
-}
-
-.loginbox .content .loginpanel .subcontent {
-  text-align:center;
+  margin-bottom:5px;
 }
 
 .loginbox .content .loginform {
@@ -1506,6 +1512,7 @@ body#grade-index .grades .weighted {
 }
 
 .loginbox .content .signupform {
+  margin-top:1em;
   text-align:center;
 }