svn commit: samba r12974 - in branches/tmp/deryck-samba4-swat/swat: . ejs style

Tue Jan 17 03:19:24 GMT 2006

Author: deryck
Date: 2006-01-17 03:19:23 +0000 (Tue, 17 Jan 2006)
New Revision: 12974

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12974

Log:

Bring login into stylesheet.
Don't link to the favicon, use the default icon position.

deryck

Modified:
   branches/tmp/deryck-samba4-swat/swat/ejs/forms.ejs
   branches/tmp/deryck-samba4-swat/swat/header.esp
   branches/tmp/deryck-samba4-swat/swat/login.esp
   branches/tmp/deryck-samba4-swat/swat/style/console.css


Changeset:
Modified: branches/tmp/deryck-samba4-swat/swat/ejs/forms.ejs
===================================================================

--- branches/tmp/deryck-samba4-swat/swat/ejs/forms.ejs	2006-01-17 03:00:10 UTC (rev 12973)
+++ branches/tmp/deryck-samba4-swat/swat/ejs/forms.ejs	2006-01-17 03:19:23 UTC (rev 12974)
@@ -66,7 +66,7 @@
 		write("</table>\n");
 	}
 	for (i in f.submit) {
-		write('<input name="submit" type="submit" value="' + f.submit[i] + '" />\n');
+		write('<input class="submit" name="submit" type="submit" value="' + f.submit[i] + '" />\n');
 	}
 	write("</form>\n");
 }

Modified: branches/tmp/deryck-samba4-swat/swat/header.esp
===================================================================
--- branches/tmp/deryck-samba4-swat/swat/header.esp	2006-01-17 03:00:10 UTC (rev 12973)
+++ branches/tmp/deryck-samba4-swat/swat/header.esp	2006-01-17 03:19:23 UTC (rev 12974)
@@ -5,7 +5,6 @@
 <head>
   <title>@@global.page.title</title>
 
-  <link rel="shortcut icon" href="/images/favicon.ico" />
   <link rel="stylesheet" href="/style/console.css" type="text/css" media="all" />
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

Modified: branches/tmp/deryck-samba4-swat/swat/login.esp
===================================================================
--- branches/tmp/deryck-samba4-swat/swat/login.esp	2006-01-17 03:00:10 UTC (rev 12973)
+++ branches/tmp/deryck-samba4-swat/swat/login.esp	2006-01-17 03:19:23 UTC (rev 12974)
@@ -5,7 +5,7 @@
 <head>
   <title>Login</title>
 
-  <link rel="shortcut icon" href="/images/favicon.ico" />
+  <link rel="stylesheet" href="/style/console.css" type="text/css" media="all" />
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Language" content="en-us" />
@@ -13,11 +13,7 @@
 
 <body>
 
-<div id="header">
-</div>
-
-<div id="content">
-
+<div id="login">
 <%
   libinclude("auth.js");
   include("/ejs/forms.ejs");
@@ -76,8 +72,7 @@
 		}
 	}
 %>
+</div> <!-- Close #login -->
 
-</div> <!-- Close #content -->
-
 </body>
 </html>

Modified: branches/tmp/deryck-samba4-swat/swat/style/console.css
===================================================================
--- branches/tmp/deryck-samba4-swat/swat/style/console.css	2006-01-17 03:00:10 UTC (rev 12973)
+++ branches/tmp/deryck-samba4-swat/swat/style/console.css	2006-01-17 03:19:23 UTC (rev 12974)
@@ -73,3 +73,17 @@
 	padding:10px;
 	border:1px solid #CCC;
 }
+
+/* Login page
+***********************************************************/
+#login {
+	background-color:#FFF;
+	width:300px;
+	margin:10% auto;
+	padding:30px;
+	border:1px solid #CCC;
+}
+#login .submit {
+	float:right;
+	margin:-25px 0 0 0;
+}

