diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am
index a56b02b131694ab0d1d4392f08d819e9ec66acac..e4920436a9c7b9a0f3a9e373a6cc6e3e49521726 100644
--- a/doc/html/Makefile.am
+++ b/doc/html/Makefile.am
@@ -101,8 +101,8 @@ html_DATA = \
plane_ex5.gif \
plane_ex6.gif \
plane_ex7.gif \
- slurm_banner.gif \
- slurm_banner_schedmd.png \
+ slurm_logo.png \
+ schedmd.png \
slurm_design.pdf \
slurmstyles.css \
sponsors.gif \
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index ea540b826f6a6d737ffa71f72709cb8b29158f17..0b1a5df1381fe8c53e405bf6dd3ab5fb5f4c2880 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -417,8 +417,8 @@ html_DATA = \
plane_ex5.gif \
plane_ex6.gif \
plane_ex7.gif \
- slurm_banner.gif \
- slurm_banner_schedmd.png \
+ slurm_logo.png \
+ schedmd.png \
slurm_design.pdf \
slurmstyles.css \
sponsors.gif \
diff --git a/doc/html/footer.txt b/doc/html/footer.txt
index 0ea9db512bb0d924d468bbb24a42d81cce536a64..871129445f284f7599e905bdb5a3a89ab232ffb5 100644
--- a/doc/html/footer.txt
+++ b/doc/html/footer.txt
@@ -1,5 +1,6 @@
+</div> <!-- closes "row" -->
</div> <!-- closes "content" -->
-
+<div id="row">
<div id="footer">
<div id="left"> <a href="disclaimer.html" target="_blank" class="privacy">Legal Notices</a></div>
<div id="right"><span class="ucrlnum"></span></div>
@@ -8,6 +9,7 @@
<div id="footer2">
<div style="clear:both;"></div>
</div>
+</div> <!-- closes "row" -->
</div> <!-- closes "container" -->
diff --git a/doc/html/header.txt b/doc/html/header.txt
index 712b265c6bafffa7488fd1437b612b551245943c..6f7dce960ac2adec5381712c1cea52c7bd9819d4 100644
--- a/doc/html/header.txt
+++ b/doc/html/header.txt
@@ -12,15 +12,6 @@ Linux clusters, high-performance computing, Livermore Computing">
<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_schedmd.png" width="796" height="96" usemap="#Map">
-</div>
-
-<div id="cse" style="width: 97%;">Loading</div>
<script src="http://www.google.com/jsapi" type="text/javascript"></script>
<script type="text/javascript">
google.load('search', '1', {language : 'en', style : google.loader.themes.V2_DEFAULT});
@@ -32,9 +23,12 @@ Linux clusters, high-performance computing, Livermore Computing">
}, true);
</script>
-<div id="navigation">
+</head>
-<h2><a href="slurm.shtml" class="nav">Home</a></h2>
+<body><div id="container"><div id="row">
+
+<div id="navigation">
+<a href="slurm.shtml"><img class="displayed" src="slurm_logo.png" width="130" usemap="#Map"></a>
<h2>About</h2>
<ul>
@@ -60,7 +54,9 @@ Linux clusters, high-performance computing, Livermore Computing">
<li><a href="download.shtml#related" class="nav">Related Software</a></li>
<li><a href="quickstart_admin.shtml" class="nav">Installation Guide</a></li>
</ul>
+<a href="http://www.schedmd.com"><img class="displayed" src="schedmd.png" width="130" usemap="#Map"></a>
</div>
<div id="content">
+<div id="cse">Loading...</div>
diff --git a/doc/html/linuxstyles.css b/doc/html/linuxstyles.css
index aa763342259de94215ef710652eb178aa15b67dc..294036ea5dcc16f6f94b5cd3687143c43aa855ec 100644
--- a/doc/html/linuxstyles.css
+++ b/doc/html/linuxstyles.css
@@ -11,8 +11,9 @@ body {
text-align:center;
}
-h1 { font-size: 130%; font-weight:bold; text-align:left; color: #066cb2; }
-h2 { font-size: 105%; font-weight:bold; text-align:left; color: #066cb2; }
+h1 { font-size: 150%; font-weight:bold; text-align:left; color: #066cb2; }
+h2 { font-size: 105%; font-weight:bold; text-align:left; padding-left: 5px;
+color: #066cb2; margin-bottom: -10px; }
h3 { font-size: 100%; font-weight:bold; text-align:left; color: #066cb2; }
p { font-size: 90%; }
p ul { font-size: 90%; }
@@ -35,6 +36,11 @@ pre {font-size: 90%; font-family:"Courier New", Courier, monospace}
border-style:solid;
background-color: #FFFFFF;
line-height:130%;
+ display:table;
+}
+
+#row {
+ display: table-row;
}
/* The Linux at Livermore banner graphic */
@@ -43,23 +49,38 @@ pre {font-size: 90%; font-family:"Courier New", Courier, monospace}
border-color:#066cb2;
border-style:solid;
background-color: #FFFFFF;
+ width: 150px;
+ height: 195px;
align: left;
}
+IMG.displayed {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+ border:0px;
+}
+
/* The left-hand navigation links */
#navigation {
float: left;
text-align:left;
- margin-top: 20px;
- width: 150px;
+ width: 175px;
overflow: auto;
+ background-color: #d2cf82;
+ border:2px;
+ border-color:#066cb2;
+ border-style:solid;
+ display:table-cell;
}
/* The main text of the page */
#content {
- margin-left: 165px;
- width: 75%;
- padding: 1em;
+ float: right;
+ width: 605px;
+ display:table-cell;
}
#content h1 { margin: 0 0 .5em 0;
@@ -88,6 +109,7 @@ pre {font-size: 90%; font-family:"Courier New", Courier, monospace}
width:400px;
text-align: left;
height: 22px;
+ display: table-cell;
}
#footer #right {
@@ -97,6 +119,7 @@ pre {font-size: 90%; font-family:"Courier New", Courier, monospace}
background-color: #066cb2;
text-align: right;
height: 22px;
+ display: table-cell;
}
#footer2 #left2 {
diff --git a/doc/html/schedmd.png b/doc/html/schedmd.png
new file mode 100644
index 0000000000000000000000000000000000000000..e03b55005ff86530e6c657cc2d03e63d63da2981
Binary files /dev/null and b/doc/html/schedmd.png differ
diff --git a/doc/html/slurm_banner.gif b/doc/html/slurm_banner.gif
deleted file mode 100644
index 8564b4b837ff23a89823e61e64cc950cc4911215..0000000000000000000000000000000000000000
Binary files a/doc/html/slurm_banner.gif and /dev/null differ
diff --git a/doc/html/slurm_banner_schedmd.png b/doc/html/slurm_banner_schedmd.png
deleted file mode 100644
index 04ae3a9a70e82d9076c95a75d7c5fb2b9a9e43f6..0000000000000000000000000000000000000000
Binary files a/doc/html/slurm_banner_schedmd.png and /dev/null differ
diff --git a/doc/html/slurm_logo.png b/doc/html/slurm_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a3039a67f1ce7a0b47cc3ad660b1f21e4dda3f0
Binary files /dev/null and b/doc/html/slurm_logo.png differ
diff --git a/doc/html/slurmstyles.css b/doc/html/slurmstyles.css
index 9ec6a8d3a5d6f5b301afb0d0f11e61bfa6ffab0c..d189e9055686f0e108ceefda877c00b898991f9d 100644
--- a/doc/html/slurmstyles.css
+++ b/doc/html/slurmstyles.css
@@ -32,12 +32,18 @@ a.nav:visited {
* and make the content section fill the width of the page.
*/
@media print {
- #navigation { display: none }
+ #container {
+ border: 0px solid gray;
+ }
#content {
margin-left: 0px;
- border-left: 0px solid gray;
- width: 90%;
+ border: 0px solid gray;
+ width: 95%;
}
+ #cse { display: none }
+ #footer { display: none }
+ #footer2 { display: none }
+ #navigation { display: none }
}
/**
@@ -47,8 +53,8 @@ a.nav:visited {
/* Slight reset to make the preview have ample padding. */
.cse .gsc-control-cse,
.gsc-control-cse {
- padding: 1em;
- width: auto;
+ margin-top: 13px;
+ margin-bottom: 13px;
}
.cse .gsc-control-wrapper-cse,
.gsc-control-wrapper-cse {