From 9a34376e21d7ae92de68840a3ae8fafcceb20881 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Fri, 5 Jan 2007 19:41:51 +0000
Subject: [PATCH] MDL-7861 xhtml strict fixes - login page - final CSS cleanup,
 finished!

---
 login/index_form.html              | 14 ++++++------
 theme/cornflower/styles_color.css  |  4 +++-
 theme/formal_white/fw_color.css    |  4 +++-
 theme/metal/colors.css             |  4 +++-
 theme/oceanblue/styles_color.css   |  7 +++++-
 theme/orangewhite/styles_color.css |  5 ++++-
 theme/standard/styles_color.css    |  1 +
 theme/standard/styles_layout.css   | 36 +++++++++++++++++++++++-------
 theme/wood/styles_color.css        |  9 ++++++++
 9 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/login/index_form.html b/login/index_form.html
index 26ddcf795c..1bd9e3a98d 100644
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -7,10 +7,10 @@ if ($show_instructions) {
 ?>
 <div class="loginbox"><div class="content">
   <div class="<?php echo $columns ?>">
-    <div class="pane left">
+    <div class="loginpanel">
      <div class="divider">
       <div class="header"><h2><?php print_string("returningtosite") ?></h2></div>
-      <div class="subcontent">
+      <div class="subcontent loginsub">
         <div class="desc">
           <?php
             print_string("loginusing");
@@ -31,12 +31,12 @@ if ($show_instructions) {
         <form action="index.php" method="post" id="login">
           <div class="loginform">
             <div class="form-label"><label for="username"><?php print_string("username") ?></label></div>
-            <div class="form-item">
+            <div class="form-input">
               <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>
-            <div class="form-item">
+            <div class="form-input">
               <input type="password" name="password" id="password" size="15" value="" />
               <input type="submit" value="<?php print_string("login") ?>" />
               <input type="hidden" name="testcookies" value="1" />
@@ -47,7 +47,7 @@ if ($show_instructions) {
       </div>
 
 <?php if ($CFG->guestloginbutton) {  ?>
-      <div class="subcontent">
+      <div class="subcontent guestsub">
         <?php print_string("someallowguest") ?>
         <form action="index.php" method="post" id="guestlogin">
           <div class="guestform">
@@ -60,7 +60,7 @@ if ($show_instructions) {
       </div>
 <?php } ?>
 
-      <div class="subcontent">
+      <div class="subcontent forgotsub">
         <?php print_string("forgotten") ?> 
         <form action="forgot_password.php" method="post" id="changepassword">
           <div class="forgottenform">
@@ -72,7 +72,7 @@ if ($show_instructions) {
      </div>
     </div>
 <?php if ($show_instructions) { ?>
-    <div class="pane right">
+    <div class="signuppanel">
       <div class="header"><h2><?php print_string("firsttime") ?></h2></div>
       <div class="subcontent">
 <?php     switch ($authsequence[0]) {
diff --git a/theme/cornflower/styles_color.css b/theme/cornflower/styles_color.css
index 48845e42d8..c4ae721ef4 100644
--- a/theme/cornflower/styles_color.css
+++ b/theme/cornflower/styles_color.css
@@ -446,7 +446,9 @@ body#course-user .section {
  *** Login
  ***/
 
-.loginbox .content {
+.loginbox .content,
+.loginbox .content .subcontent,
+.loginbox .twocolumns .divider {
   border-color:#739FC4;
 }
 
diff --git a/theme/formal_white/fw_color.css b/theme/formal_white/fw_color.css
index cb25600bc2..868a387f83 100644
--- a/theme/formal_white/fw_color.css
+++ b/theme/formal_white/fw_color.css
@@ -112,7 +112,9 @@ background-color:#E3DFD4;
  ***/
 
 
-.loginbox .header {
+.loginbox .content,
+.loginbox .content .subcontent,
+.loginbox .twocolumns .divider {
   border-color:#C6BDA8;
 }
 
diff --git a/theme/metal/colors.css b/theme/metal/colors.css
index 15cb85efba..e3b4206924 100755
--- a/theme/metal/colors.css
+++ b/theme/metal/colors.css
@@ -432,7 +432,9 @@ body#course-user .section {
  *** Login
  ***/
 
-.loginbox .content {
+.loginbox .content,
+.loginbox .content .subcontent,
+.loginbox .twocolumns .divider {
   border-color:#999999;
 }
 
diff --git a/theme/oceanblue/styles_color.css b/theme/oceanblue/styles_color.css
index 5820178043..2e3763e761 100644
--- a/theme/oceanblue/styles_color.css
+++ b/theme/oceanblue/styles_color.css
@@ -541,8 +541,13 @@ body#grade-index .grades .r1 {
  *** Login
  ***/
 
-.loginbox .content {
+.loginbox .content,
+.loginbox .content .subcontent,
+.loginbox .twocolumns .divider {
   border-color:#9999FF;
+}
+
+.loginbox .content {
   background-color: #FFFFFF;
 }
 
diff --git a/theme/orangewhite/styles_color.css b/theme/orangewhite/styles_color.css
index 053127e5d4..93b7c49557 100644
--- a/theme/orangewhite/styles_color.css
+++ b/theme/orangewhite/styles_color.css
@@ -461,7 +461,10 @@ table.minicalendar {
 .loginbox {
   background-color:#F9FAFA
 }
-.loginbox .content {
+
+.loginbox .content,
+.loginbox .content .subcontent,
+.loginbox .twocolumns .divider {
   border-color:#DDD
 }
 
diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css
index 3d9a1ddaae..0d7fbf557f 100644
--- a/theme/standard/styles_color.css
+++ b/theme/standard/styles_color.css
@@ -627,6 +627,7 @@ body#grade-index .grades .r1 {
  ***/
 
 .loginbox .content,
+.loginbox .content .subcontent,
 .loginbox .twocolumns .divider {
   border-color:#DDDDDD;
 }
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index fc6a3469a1..79a29e7e10 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -1462,16 +1462,32 @@ body#grade-index .grades .weighted {
   padding:10px;
 }
 
-.loginbox .content .left .subcontent {
-  text-align:center;
+.loginbox .content .loginsub {
+  margin-left:0%;
+  margin-right:0%;
 }
 
-.loginbox .content .signupform {
+.loginbox .content .guestsub {
+  border-top:1px solid;
+  margin-top:1.5em;
+  margin-left:12%;
+  margin-right:12%;
+}
+
+.loginbox .content .forgotsub {
+  border-top:1px solid;
+  margin-top:1.5em;
+  margin-left:12%;
+  margin-right:12%;
+}
+
+.loginbox .content .loginpanel .subcontent {
   text-align:center;
 }
 
 .loginbox .content .loginform {
-    text-align:left;
+  margin-top:1em;
+  text-align:left;
 }
 
 .loginbox .content .loginform .form-label {
@@ -1480,15 +1496,18 @@ body#grade-index .grades .weighted {
   width:40%;
 }
 
-.loginbox .content .loginform .form-item {
+.loginbox .content .loginform .form-input {
   float:right;
   width:59%;
 }
 
-.loginbox .content .loginform .form-item input {
+.loginbox .content .loginform .form-input input {
   width: 6em;
 }
 
+.loginbox .content .signupform {
+  text-align:center;
+}
 
 .loginbox .twocolumns .divider {
   border-right:1px solid;
@@ -1496,13 +1515,13 @@ body#grade-index .grades .weighted {
   margin-bottom:-2000px;padding-bottom:2000px;
 }
 
-.loginbox .twocolumns .left {
+.loginbox .twocolumns .loginpanel {
   float:left;
   width:50%;
   margin-bottom:-2000px;padding-bottom:2000px;
 }
 
-.loginbox .twocolumns .right {
+.loginbox .twocolumns .signuppanel {
   float:right;
   width:50%;
   margin-bottom:-2000px; padding-bottom:2000px;
@@ -1512,6 +1531,7 @@ body#grade-index .grades .weighted {
   margin:0.3em 0.8em;
   text-align:right;
 }
+
 .block_login .btn input {
   text-align:center;
 }
diff --git a/theme/wood/styles_color.css b/theme/wood/styles_color.css
index 4d512eee2f..2d4c2dde6e 100644
--- a/theme/wood/styles_color.css
+++ b/theme/wood/styles_color.css
@@ -192,6 +192,15 @@ table.files,
     background-repeat:repeat-x repeat-y;
 }
 
+.loginbox .twocolumns .divider {
+    border-right:1px solid #330000;
+}
+
+.loginbox .content .guestsub,
+.loginbox .content .forgotsub {
+      border-top:1px solid #FFCC99;
+}
+
 /** Places using the vertical white wood texture without borders **/
 
 #mod-chat-gui_header_js-users,
-- 
2.39.5