diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am
index 97446744ee856925309f5f8bcaa229cf7a19cc3e..00e216d09dc04aead6f2095eb32fe64ad64e9501 100644
--- a/doc/html/Makefile.am
+++ b/doc/html/Makefile.am
@@ -34,8 +34,8 @@ generated_html = \
selectplugins.html \
slurm.html \
switchplugins.html \
- team.html \
- testimonials.html \
+ team.html \
+ testimonials.html \
troubleshoot.html
html_DATA = \
@@ -53,11 +53,10 @@ html_DATA = \
plane_ex5.gif \
plane_ex6.gif \
plane_ex7.gif \
- slurm_banner_filler.jpg \
- slurm_banner_left.jpg \
- slurm_banner_right.jpg \
+ slurm_banner.gif \
slurm_design.pdf \
- slurmstyles.css
+ slurmstyles.css \
+ linuxstyles.css
MOSTLYCLEANFILES = ${generated_html}
diff --git a/doc/html/footer.txt b/doc/html/footer.txt
index 275db69e362437b88a47bbc4a8d3adfc0c2a3760..64b3d8b9c0c66708cd9139d1dabd064f0bc9886f 100644
--- a/doc/html/footer.txt
+++ b/doc/html/footer.txt
@@ -1,17 +1,33 @@
-</div>
+</div> <!-- closes "content" -->
<div id="footer">
-For information about this page, contact
-<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.
-<br><br>
-SLURM is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your option)
-any later version. See the GNU General Public License for more details.
-<br><br>
-<a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a>
-UCRL-WEB-225274
+<div id="left"> <span class="ucrlnum">UCRL-WEB-225274 |</span> <a href="http://www.llnl.gov/disclaimer.html" target="_blank" class="privacy">Privacy & Legal Notice</a></div>
+<div id="right"><span class="ucrlnum">November 28, 2006 </span></div>
+</div>
+
+<div id="footer2">
+<div id="left2"><img src="http://cmg.llnl.gov/linux/linux_new/images/nnsa_doe_uc_comp.gif" width="250" height="30" border="0" usemap="#Map2"></div>
+<div id="center2"><a href="http://www.llnl.gov/" target="_blank" class="footer">Lawrence Livermore National Laboratory</a><br />
+<span class="smalltextblue">7000 East Avenue • Livermore, CA 94550</span></div>
+<div id="right2"><span class="smalltextblue">Operated by
+the</span> <a href="http://www.universityofcalifornia.edu/" target="_blank" class="footer">University of California</a><br />
+<span class="smalltextblue">for the</span> <a href="http://www.energy.gov/" target="_blank" class="footer">Department of Energy's</a><br />
+<a href="http://www.nnsa.doe.gov/" target="_blank" class="footer">National
+Nuclear Security Administration</a></div>
+<div style="clear:both;"></div>
</div>
-</div></body>
+</div> <!-- closes "container" -->
+
+<map name="Map">
+<area shape="rect" coords="571,1,799,15" href="http://www.llnl.gov/">
+</map>
+<map name="Map2">
+<area shape="rect" coords="3,2,95,34" href="http://www.nnsa.doe.gov/" target="_blank" alt="NNSA logo links to the NNSA Web site">
+<area shape="rect" coords="97,1,133,28" href="http://www.energy.gov/" target="_blank" alt="Department of Energy logo links to the DOE Web site">
+<area shape="rect" coords="136,0,164,28" href="http://www.universityofcalifornia.edu/" target="_blank" alt="University of California logo links to the UC Web site">
+<area shape="rect" coords="172,2,249,31" href="http://www.llnl.gov/computing/hpc/" target="_blank">
+</map>
+
+</body>
</html>
diff --git a/doc/html/header.txt b/doc/html/header.txt
index 29314017996b4e5992677c779ca4731b7b4db42c..a01df88ec4c3727b1ae11a0c4ce0fdfad9fd0d87 100644
--- a/doc/html/header.txt
+++ b/doc/html/header.txt
@@ -21,29 +21,17 @@ Department of Energy under Contract W-7405-Eng-48">
content="DOE:DOE Web sites via organizational
structure:Laboratories and Other Field Facilities">
<title>Simple Linux Utility for Resource Management</title>
+<link href="linuxstyles.css" rel="stylesheet" type="text/css">
<link href="slurmstyles.css" rel="stylesheet" type="text/css">
</head>
<body><div id="container">
<div id="banner">
-<img src="slurm_banner_left.jpg" width="565" height="145" usemap="#Map_left" border=0
- alt="Simple Linux Utility for Resource Management">
-<map name="Map_left">
- <area shape="rect" coords="330,1,468,11"
- href="http://www.llnl.gov/disclaimer.html">
- <area shape="rect" coords="11,23,213,115" href="slurm.shtml">
-</map>
-<img src="slurm_banner_right.jpg" id="banner_right_img" width="138" height="100"
- usemap="#Map_right" border=0>
-<map name="Map_right">
- <area shape="rect" coords="0,0,138,100" href="../">
-</map>
+<img src="slurm_banner.gif" width="800" height="100" border="0" usemap="#Map">
</div>
<div id="navigation">
-<h1>Navigation</h1>
-<a href="slurm.shtml" class="nav" align="center">Home</a>
<h2>About</h2>
<ul>
<li><a href="overview.shtml" class="nav">Overview</a></li>
diff --git a/doc/html/slurm_banner.gif b/doc/html/slurm_banner.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3a6d6d517ff0340764b5a687ae5fde4fed4d598c
Binary files /dev/null and b/doc/html/slurm_banner.gif differ
diff --git a/doc/html/slurm_banner_filler.jpg b/doc/html/slurm_banner_filler.jpg
deleted file mode 100644
index eeb049c851a37c02e01de2a93abcf86452acfc02..0000000000000000000000000000000000000000
Binary files a/doc/html/slurm_banner_filler.jpg and /dev/null differ
diff --git a/doc/html/slurm_banner_filler.png b/doc/html/slurm_banner_filler.png
deleted file mode 100644
index fca0ea1f38a15c9510b4efa71b8ea9341c0b45dd..0000000000000000000000000000000000000000
Binary files a/doc/html/slurm_banner_filler.png and /dev/null differ
diff --git a/doc/html/slurm_banner_left.jpg b/doc/html/slurm_banner_left.jpg
deleted file mode 100644
index 1ac4a81cf4b17ce979dedc32beddc87509f053cb..0000000000000000000000000000000000000000
Binary files a/doc/html/slurm_banner_left.jpg and /dev/null differ
diff --git a/doc/html/slurm_banner_left.png b/doc/html/slurm_banner_left.png
deleted file mode 100644
index 68bb4220fb1b1fd15401c90e489fa3d8ea9b1f37..0000000000000000000000000000000000000000
Binary files a/doc/html/slurm_banner_left.png and /dev/null differ
diff --git a/doc/html/slurm_banner_right.jpg b/doc/html/slurm_banner_right.jpg
deleted file mode 100644
index b29fd3856b65c5ac395da612059809430a95cbc8..0000000000000000000000000000000000000000
Binary files a/doc/html/slurm_banner_right.jpg and /dev/null differ
diff --git a/doc/html/slurm_banner_right.png b/doc/html/slurm_banner_right.png
deleted file mode 100644
index 70ac3d58f86d30695b7f099aacbbde44127ec756..0000000000000000000000000000000000000000
Binary files a/doc/html/slurm_banner_right.png and /dev/null differ
diff --git a/doc/html/slurmstyles.css b/doc/html/slurmstyles.css
index e32e98011bc18a119824918d175c037258b5fe44..2505e4180485dfbc1c662123476e5b97738c4a73 100644
--- a/doc/html/slurmstyles.css
+++ b/doc/html/slurmstyles.css
@@ -1,78 +1,3 @@
-body {
- background-color: #000000;
- font-family: arial, verdana, helvetica, sans-serif;
-}
-h1 { font-size: 150% }
-h2 { font-size: 130% }
-h3 { font-size: 115% }
-p { font-size: 100% }
-
-pre {
- width: 90%;
- margin: 0 0 15px 20px;
- padding: 15px;
- border: 1px solid gray;
- background-color: #ddd;
- font-family: monospace;
- white-space: pre;
- overflow: auto;
-}
-
-/* "container" wraps the entire web page */
-#container {
- width: 95%;
- margin: 10px auto;
- background-color: #fff;
- color: #333;
- border: 0px solid gray;
- line-height: 130%;
-}
-
-#banner {
- /*
- * In IE6, the "banner" div is a little taller than the slurm_banner.jpg
- * (who knows why...) and if the background-color was #000000, a line of
- * black would appear under the banner.
- */
- background-color: #FFFFFF;
- /*background-color: #000000;*/
- background-image: url(slurm_banner_filler.jpg);
- background-repeat: repeat-x;
- /*border-bottom: 1px solid gray;*/
-}
-#banner_right_img {
- position: absolute;
- right: 5%;
- z-index: 1;
-}
-
-#navigation {
- float: left;
- margin-left: 20px;
- width: 160px;
- overflow: auto;
-}
-
-/* The main info of the page is wrapped in a "content" div */
-#content {
- margin-left: 200px;
- border-left: 1px solid gray;
- padding: 1em;
- /*max-width: 36em;*/
-}
-#content h1 { text-align: center; }
-#content dt { font-weight: bold; } /* normal, bold, 900 */
-
-#footer {
- clear: both;
- margin: 0;
- padding: .5em;
- color: #333;
- background-color: #ddd;
- border-top: 1px solid gray;
- text-align: center;
-}
-
div.figure {
/*float: right;*/
margin: 0 0 15px 20px;
@@ -83,22 +8,34 @@ div.figure {
overflow: auto;
}
-div.terminal {
- width: 90%;
+pre {
+ /*width: 90%;*/
margin: 0 0 15px 20px;
padding: 15px;
border: 1px solid gray;
background-color: #ddd;
- font-family: monospace;
white-space: pre;
overflow: auto;
}
+a:visited {
+ /*color: #6633FF;*/
+ color: #581C90;
+}
+
+a.nav:visited {
+ /*color: #6633FF;*/
+ color: #581C90;
+}
+
/* When printing, eliminate the nagivation column on the left,
* and make the content section fill the width of the page.
*/
@media print {
#navigation { display: none }
- #content { margin-left: 0px; border-left: 0px solid gray; }
+ #content {
+ margin-left: 0px;
+ border-left: 0px solid gray;
+ width: 90%;
}
}