svn commit: samba r13049 - in branches/tmp/deryck-samba4-swat/swat:
. style
deryck at samba.org
deryck at samba.org
Fri Jan 20 06:42:17 GMT 2006
Author: deryck
Date: 2006-01-20 06:42:16 +0000 (Fri, 20 Jan 2006)
New Revision: 13049
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13049
Log:
Work on the layout of the main SWAT interface.
This gets a management console look while remaining
a web application, I think. Scaling for browser
size works pretty well, too.
deryck
Modified:
branches/tmp/deryck-samba4-swat/swat/footer.esp
branches/tmp/deryck-samba4-swat/swat/header.esp
branches/tmp/deryck-samba4-swat/swat/index.esp
branches/tmp/deryck-samba4-swat/swat/style/console.css
Changeset:
Modified: branches/tmp/deryck-samba4-swat/swat/footer.esp
===================================================================
--- branches/tmp/deryck-samba4-swat/swat/footer.esp 2006-01-20 01:11:26 UTC (rev 13048)
+++ branches/tmp/deryck-samba4-swat/swat/footer.esp 2006-01-20 06:42:16 UTC (rev 13049)
@@ -1,5 +1,7 @@
-</div> <!-- Close #content -->
+ </div> <!-- Close #content -->
+</div> <!-- Close #wrap -->
+
</body>
</html>
Modified: branches/tmp/deryck-samba4-swat/swat/header.esp
===================================================================
--- branches/tmp/deryck-samba4-swat/swat/header.esp 2006-01-20 01:11:26 UTC (rev 13048)
+++ branches/tmp/deryck-samba4-swat/swat/header.esp 2006-01-20 06:42:16 UTC (rev 13049)
@@ -13,33 +13,35 @@
<body>
-<div id="header">
- <div id="logout">
- <span>logged in as @@session.authinfo.username</span>
- <form method="post" action="/logout.esp@@global.SESSIONURI">
- <input type="submit" value="Logout" />
- </form>
+<div id="app">
+
+ <div id="header">
+ <div id="logout">
+ <span>logged in as @@session.authinfo.username</span>
+ <form method="post" action="/logout.esp@@global.SESSIONURI">
+ <input type="submit" value="Logout" />
+ </form>
+ </div>
</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="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>
+ <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>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>
+ <p>Obviously, we'll go for auto generated info/help since this header
+ will be included on every page.</p>
+ </div>
-<div id="content">
+ <div id="content">
Modified: branches/tmp/deryck-samba4-swat/swat/index.esp
===================================================================
--- branches/tmp/deryck-samba4-swat/swat/index.esp 2006-01-20 01:11:26 UTC (rev 13048)
+++ branches/tmp/deryck-samba4-swat/swat/index.esp 2006-01-20 06:42:16 UTC (rev 13049)
@@ -11,9 +11,9 @@
%>
-<h1>Samba Web Administration Tool</h1>
+ <h1>Samba Web Administration Tool</h1>
-<h3>Options Will Follow Soon</h3>
+ <h3>Options Will Follow Soon</h3>
<%
page_footer();
Modified: branches/tmp/deryck-samba4-swat/swat/style/console.css
===================================================================
--- branches/tmp/deryck-samba4-swat/swat/style/console.css 2006-01-20 01:11:26 UTC (rev 13048)
+++ branches/tmp/deryck-samba4-swat/swat/style/console.css 2006-01-20 06:42:16 UTC (rev 13049)
@@ -2,11 +2,12 @@
Web-based server management console look and feel
*/
+
/* Base elements
***********************************************************/
body {
background-color:#4566AD;
- margin:0;
+ margin:3px;
padding:0;
font-family:sans-serif;
color:#000;
@@ -15,9 +16,22 @@
list-style-type:none;
}
+
+/* Box in the app
+***********************************************************/
+#app {
+ background-color:#FFF;
+ float:left;
+ padding:0;
+ border:2px solid #EEE;
+}
+
+
/* Logout and notices
***********************************************************/
#header {
+ background-color:#003062;
+ color:#FFF;
width:100%;
padding:2px 0;
text-align:right;
@@ -35,12 +49,15 @@
/* Application-wide navigation menu
***********************************************************/
#menu {
+ background-color:#EEE;
width:100%;
margin:0;
+ padding:5px 0;
line-height:0;
- border-bottom:1px inset #000;
+ border-bottom:1px solid #CCC;
}
#menu ul {
+ margin:7px 0 15px 0;
padding-left:0;
font-size:small;
}
@@ -55,24 +72,25 @@
view for registry-editor-like things */
#help {
background-color:#FFF;
+ position:relative;
+ top:2px;
float:left;
width:20%;
- height:75%;
- margin:10px 10px 20px 10px;
+ margin:0 15px 0 0;
padding:10px;
- border:1px solid #CCC;
+ border-right:10px solid #EEE;
+ border-top:3px solid #EEE;
+ z-index:1;
}
/* Main content area
***********************************************************/
#content {
background-color:#FFF;
- float:left;
- width:72%;
- height:75%;
- margin:10px 0 20px 0;
- padding:10px;
- border:1px solid #CCC;
+ position:relative;
+ width:100%;
+ margin:0px 0 20px 0;
+ border-top:5px solid #EEE;
}
/* Login page
@@ -80,7 +98,7 @@
#login {
background:url(/images/logo.png) left center no-repeat #FFF;
padding:50px;
- margin:170px auto 0 auto;
+ margin:15% auto 0 auto;
border-top:1px solid #012149;
border-bottom:1px solid #012149;
}
More information about the samba-cvs
mailing list