[LON-CAPA-cvs] cvs: loncom /auth lonlogin.pm /interface loncommon.pm

[tempelho]

tempelho		Wed Apr  8 10:13:13 2009 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
    /loncom/auth	lonlogin.pm 
  Log:
  Style preparations for a new loginpage layout, layout changes on loginpage
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.784 loncom/interface/loncommon.pm:1.785
--- loncom/interface/loncommon.pm:1.784	Sat Apr  4 21:47:40 2009
+++ loncom/interface/loncommon.pm	Wed Apr  8 10:13:08 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.784 2009/04/04 21:47:40 bisitz Exp $
+# $Id: loncommon.pm,v 1.785 2009/04/08 10:13:08 tempelho Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5866,7 +5866,7 @@
 .LC_loginpage_container {
 	text-align:left;
 	margin : 0 auto;
-	width:65%;
+	width:90%;
 	padding: 10px;
 	height: auto;
 	background-color:#FFFFFF;
@@ -5877,6 +5877,7 @@
 .LC_loginpage_loginContainer {
 	float:left;
 	width: 182px;
+	padding: 2px;
 	border:1px solid #CCCCCC;
 	background-color:$loginbg;
 }
@@ -5888,19 +5889,12 @@
 	color:$textcol;
 	padding-left:5px;
 }
+
 .LC_loginpage_loginInfo {
-	margin-left:20px;
 	float:left;
-	width:30%;
+	width:182px;
 	border:1px solid #CCCCCC;
-	padding:10px;
-}
-
-.LC_loginpage_loginDomain {
-	margin-right:20px;
-	width:20%;
-	float:left;
-	padding:10px;
+	padding:2px;
 }
 
 .LC_loginpage_space {
@@ -5909,6 +5903,12 @@
 	border-bottom: 1px solid #CCCCCC;
 }
 
+.LC_loginpage_floatLeft {
+	float: left;
+	width: 200px;
+	margin: 0;
+}
+
 table em{
 	font-weight: bold;
 	font-style: normal;
Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.117 loncom/auth/lonlogin.pm:1.118
--- loncom/auth/lonlogin.pm:1.117	Wed Apr  1 14:43:19 2009
+++ loncom/auth/lonlogin.pm	Wed Apr  8 10:13:13 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.117 2009/04/01 14:43:19 hauer Exp $
+# $Id: lonlogin.pm,v 1.118 2009/04/08 10:13:13 tempelho Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -302,10 +302,7 @@
 
 # --------------------------------------------------- Print login screen header
 
-my %add_entries = (topmargin    => "0",
-	       leftmargin   => "0",
-	       marginheight => "0",
-	       marginwidth  => "0",
+my %add_entries = (
 	       bgcolor      => "$mainbg",
 	       text         => "$font",
 	       link         => "$link",
@@ -415,12 +412,9 @@
 </table>
 HEADER
     }
-    if ($showmainlogo) {
-        $r->print('<div class="LC_loginpage_space">&nbsp;</div>'."\n".
-                  '    <img src="'.$logo.'" alt="" />'."\n");
-    }
     $r->print(<<ENDTOP);
-<div class="LC_loginpage_loginDomain">$domainlogo</div>
+<div class="LC_loginpage_space">&nbsp;</div>
+<div class="LC_loginpage_floatLeft">
 <div class="LC_loginpage_loginContainer">
   $logintitle
    <table border="0" align="left" cellspacing="1" cellpadding="2" width="100%">
@@ -441,14 +435,18 @@
         $coursecatalog<br /><br />
         <a href="/adm/about.html"><b>$lt{'about'}</b></a>
 </div>
-
-<div class="LC_loginpage_space">&nbsp;</div>
+</div>
+ENDTOP
+    if ($showmainlogo) {
+        $r->print(' <img src="'.$logo.'" alt="" />'."\n");
+    }
+$r->print(<<ENDTOP);
 $announcements
+$domainlogo
+<div class="LC_loginpage_space">&nbsp;</div>
 ENDTOP
 }
 
-if($announcements){$r->print('<div class="LC_loginpage_space">&nbsp;</div>');}
-
 if ($fullgraph) {
 $r->print(<<ENDDOCUMENT);
      <table border="0" cellspacing="0" cellpadding="0">