svn commit: samba r6330 - in trunk: source/web swat/include
deryck at samba.org
deryck at samba.org
Wed Apr 13 22:07:41 GMT 2005
Author: deryck
Date: 2005-04-13 22:07:40 +0000 (Wed, 13 Apr 2005)
New Revision: 6330
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6330
Log:
This finishes up the "services" page view, and cleans up
the footer on every page. All I have left to finish my
first pass at a SWAT redesign is:
* A fix to enable better handling of default values
in all the forms within SWAT
* Some Cross browser cleanup work
--deryck
Modified:
trunk/source/web/swat.c
trunk/swat/include/footer.html
trunk/swat/include/main.css
Changeset:
Modified: trunk/source/web/swat.c
===================================================================
--- trunk/source/web/swat.c 2005-04-13 07:15:43 UTC (rev 6329)
+++ trunk/source/web/swat.c 2005-04-13 22:07:40 UTC (rev 6330)
@@ -584,7 +584,23 @@
****************************************************************************/
static void services_page(void)
{
- printf("Get served here.\n");
+ printf(" <div class=\"whereto\">\n");
+ printf(" <h2>File and Printer Shares</h2>\n\n");
+ printf(" <p>Follow the links below to edit service-level parameters for file and printer shares.</p>\n");
+ printf(" </div>\n\n");
+
+ printf(" <div class=\"view_conf\"><a href=\"viewconfig\" onclick=\"openHelp(this.href); return false\">View smb.conf file</a></div>\n\n");
+
+ printf(" <div class=\"services_opts\">\n");
+ printf(" <ul>\n");
+ printf(" <li><a href=\"shares\">File Shares</a></li>\n");
+ printf(" <li><a href=\"printers\">Printer Shares</a></li>\n");
+ printf(" </ul>\n");
+ printf(" </div>\n\n");
+
+ printf(" <div>\n");
+ printf(" <p>Shares may also be added via the links above.</p>\n");
+ printf(" </div>\n\n");
}
/****************************************************************************
@@ -836,7 +852,7 @@
printf(" <div class=\"whereto\">\n");
printf(" <h2>Configuring Samba</h2>\n\n");
printf(" <p>The following menu allows for editing of global parameters affecting your Samba configuration.</p>\n");
- printf(" </div\n");
+ printf(" </div>\n\n");
printf(" <div class=\"view_conf\"><a href=\"viewconfig\" onclick=\"openHelp(this.href); return false\">View smb.conf file</a></div>\n\n");
@@ -896,6 +912,8 @@
snum = lp_servicenumber(share);
printf("<H2>%s</H2>\n", _("Share Parameters"));
+
+ printf(" <div class=\"view_conf\"><a href=\"services\">Return to Services Page</a><a href=\"viewconfig\" onclick=\"openHelp(this.href); return false\">View smb.conf file</a></div>\n\n");
if (cgi_variable("Commit") && snum >= 0) {
commit_parameters(snum);
@@ -1237,6 +1255,8 @@
snum = lp_servicenumber(share);
printf("<H2>%s</H2>\n", _("Printer Parameters"));
+
+ printf(" <div class=\"view_conf\"><a href=\"services\">Return to Services Page</a><a href=\"viewconfig\" onclick=\"openHelp(this.href); return false\">View smb.conf file</a></div>\n\n");
printf("<H3>%s</H3>\n", _("Important Note:"));
printf(_("Printer names marked with [*] in the Choose Printer drop-down box "));
Modified: trunk/swat/include/footer.html
===================================================================
--- trunk/swat/include/footer.html 2005-04-13 07:15:43 UTC (rev 6329)
+++ trunk/swat/include/footer.html 2005-04-13 22:07:40 UTC (rev 6330)
@@ -1,6 +1,8 @@
<div id="footer">
- <img src="/swat/images/logo.png" alt="Samba" />
+ <p>For the latest news and information on Samba, please see
+ <a href="http://samba.org/">http://samba.org/</a>.
+ <img src="/swat/images/logo.png" alt="Samba" /></p>
</div>
</div> <!-- Close control div -->
Modified: trunk/swat/include/main.css
===================================================================
--- trunk/swat/include/main.css 2005-04-13 07:15:43 UTC (rev 6329)
+++ trunk/swat/include/main.css 2005-04-13 22:07:40 UTC (rev 6330)
@@ -63,15 +63,26 @@
padding-left:28px;
}
#footer {
- text-align:right;
+ text-align:center;
+ font-size:small;
+ font-style:italic;
}
+#footer p {
+ margin:40px 0 0 0;
+ width:100%;
+}
#footer img {
+ position:relative;
+ top:17px;
width:84px;
height:40px;
+ margin:0 25px 0 0;
}
.view_conf {
- float:right;
- position:relative;
- top:-100px;
+ position:absolute;
+ top:100px;
+ right:15%;
}
+.view_conf a {
+ display:block;
}
More information about the samba-cvs
mailing list