svn commit: samba r12973 - in branches/tmp/deryck-samba4-swat/swat:
. style
deryck at samba.org
deryck at samba.org
Tue Jan 17 03:00:19 GMT 2006
Author: deryck
Date: 2006-01-17 03:00:10 +0000 (Tue, 17 Jan 2006)
New Revision: 12973
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12973
Log:
Initial pass at bringing some style to the stripped-down SWAT2.
Basic layout for the page elements is in place now.
deryck
Added:
branches/tmp/deryck-samba4-swat/swat/style/console.css
Modified:
branches/tmp/deryck-samba4-swat/swat/header.esp
branches/tmp/deryck-samba4-swat/swat/index.esp
Changeset:
Modified: branches/tmp/deryck-samba4-swat/swat/header.esp
===================================================================
--- branches/tmp/deryck-samba4-swat/swat/header.esp 2006-01-17 01:18:27 UTC (rev 12972)
+++ branches/tmp/deryck-samba4-swat/swat/header.esp 2006-01-17 03:00:10 UTC (rev 12973)
@@ -6,6 +6,7 @@
<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" />
<meta http-equiv="Content-Language" content="en-us" />
@@ -14,13 +15,32 @@
<body>
<div id="header">
- <div class="logout">
- <b>logged in as @@session.authinfo.username</b>
+ <div id="logout">
+ <span>logged in as @@session.authinfo.username</span>
<form method="post" action="/logout.esp@@global.SESSIONURI">
- <input type="submit" value="Logout" />
+ <input type="submit" value="Logout" />
</form>
</div>
</div>
+<div id="menu">
+ <ul>
+ <li>Server Status</li>
+ <li>Users</li>
+ <li>Shares</li>
+ <li>Options</li>
+ <li>Adv. Configuration</li>
+ </ul>
+</div>
+
+<div id="help">
+ <h3>Hard-coded Server Info</h3>
+
+ <p>For now, we'll provide hard coded info to get page layout correct.</p>
+
+ <p>Obviously, we'll go for auto generated info/help since this header
+ will be included on every page.</p>
+</div>
+
<div id="content">
Modified: branches/tmp/deryck-samba4-swat/swat/index.esp
===================================================================
--- branches/tmp/deryck-samba4-swat/swat/index.esp 2006-01-17 01:18:27 UTC (rev 12972)
+++ branches/tmp/deryck-samba4-swat/swat/index.esp 2006-01-17 03:00:10 UTC (rev 12973)
@@ -1,5 +1,6 @@
<%
- page_header("Server Status");
+ page_header("Samba Web Administration Tool");
+
libinclude("base.js");
libinclude("management.js");
libinclude("provision.js");
@@ -10,24 +11,10 @@
%>
-<h1>Server Status</h1>
+<h1>Samba Web Administration Tool</h1>
-<%
-var servers = new Array("nbt_server", "smb_server", "ldap_server", "cldap_server", "kdc_server");
-var i;
-var info = new Object();
+<h3>Options Will Follow Soon</h3>
-info["NBT Server"] = server_status("nbt");
-info["WINS Server"] = server_status("wins");
-info["CLDAP Server"] = server_status("cldap");
-info["Kerberos Server"] = server_status("kdc");
-info["SMB Server"] = stream_server_status("smb");
-info["LDAP Server"] = stream_server_status("ldap");
-info["RPC Server"] = stream_server_status("rpc");
-
-simple_table(info);
-%>
-
<%
page_footer();
%>
Added: branches/tmp/deryck-samba4-swat/swat/style/console.css
===================================================================
--- branches/tmp/deryck-samba4-swat/swat/style/console.css 2006-01-17 01:18:27 UTC (rev 12972)
+++ branches/tmp/deryck-samba4-swat/swat/style/console.css 2006-01-17 03:00:10 UTC (rev 12973)
@@ -0,0 +1,75 @@
+/*
+ Web-based server management console look and feel
+*/
+
+/* Base elements
+***********************************************************/
+body {
+ background-color:#EEE;
+ margin:0;
+ padding:0;
+ font-family:sans-serif;
+ color:#000;
+}
+ul {
+ list-style-type:none;
+}
+
+/* Logout and notices
+***********************************************************/
+#header {
+ width:100%;
+ padding:2px;
+ text-align:right;
+ font-size:small;
+ border-bottom:1px inset #000;
+}
+#header form {
+ display:inline;
+}
+#logout form {
+ margin:0 5px 0 0;
+}
+
+/* Application-wide navigation menu
+***********************************************************/
+#menu {
+ width:100%;
+ margin:0;
+ line-height:0;
+ border-bottom:1px inset #000;
+}
+#menu ul {
+ padding-left:0;
+ font-size:small;
+}
+#menu li {
+ float:left;
+ margin:0 20px;
+}
+
+/* Left-column help/info menu
+***********************************************************/
+/* Probably will double as tree
+ view for registry-editor-like things */
+#help {
+ background-color:#FFF;
+ float:left;
+ width:20%;
+ height:75%;
+ margin:10px 10px 20px 10px;
+ padding:10px;
+ border:1px solid #CCC;
+}
+
+/* Main content area
+***********************************************************/
+#content {
+ background-color:#FFF;
+ float:left;
+ width:72%;
+ height:75%;
+ margin:10px 0 20px 0;
+ padding:10px;
+ border:1px solid #CCC;
+}
More information about the samba-cvs
mailing list