r8479: * Sync CSS with current samba.org stylesheets.

* Add wide.css so it's availble for future pages.
* Move SWAT specific styles to swat.css to make future syncs easier.

deryck
(This used to be commit 7ddc3ed5b87687a66995d2555c683efcb93be7e2)

8 files changed, 275 insertions, 88 deletions

diff --git a/swat/images/stripes.png b/swat/images/stripes.png
new file mode 100644
index 0000000000..5c5941ff38
--- /dev/null
+++ b/swat/images/stripes.png
diff --git a/swat/scripting/common.js b/swat/scripting/common.js
index 631efcacb7..c431c8c1b0 100644
--- a/swat/scripting/common.js
+++ b/swat/scripting/common.js
@@ -73,7 +73,9 @@ function always_allowed(uri) {
 	var allowed = new Array("/images/favicon.ico", 
 				"/images/linkpad.gif",
 				"/images/logo.png",
-				"/style/main.css",
+				"/images/stripes.png",
+				"/style/columns.css",
+				"/style/swat.css",
 				"/style/common.css");
 	for (i in allowed) {
 		if (allowed[i] == uri) {
diff --git a/swat/scripting/header_columns.esp b/swat/scripting/header_columns.esp
index 3d92bb9522..e870a1110a 100644
--- a/swat/scripting/header_columns.esp
+++ b/swat/scripting/header_columns.esp
@@ -6,7 +6,8 @@
   <title>@@global.page.title</title>
 
 <link rel="stylesheet" href="/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/style/main.css" type="text/css" media="all" />
+<link rel="stylesheet" href="/style/columns.css" type="text/css" media="all" />
+<link rel="stylesheet" href="/style/swat.css" type="text/css" media="all" />
 <link rel="shortcut icon" href="/images/favicon.ico" />
 
 <!--[if gte IE 5.5]>
@@ -59,7 +60,7 @@ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/images/logo.png'
   <h4>Samba Web Administration Tool</h4>
 </div>
 
-<div class="nav">
+<div id="nav">
      <% 
      include("/docs/menu.js"); 
      include("/esptest/menu.js");
diff --git a/swat/scripting/header_plain.esp b/swat/scripting/header_plain.esp
index f9eaae9b96..8dd378910e 100644
--- a/swat/scripting/header_plain.esp
+++ b/swat/scripting/header_plain.esp
@@ -6,7 +6,8 @@
   <title>@@global.page.title</title>
 
 <link rel="stylesheet" href="/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/style/main.css" type="text/css" media="all" />
+<link rel="stylesheet" href="/style/columns.css" type="text/css" media="all" />
+<link rel="stylesheet" href="/style/swat.css" type="text/css" media="all" />
 <link rel="shortcut icon" href="/images/favicon.ico" />
 
 <!--[if gte IE 5.5]>
diff --git a/swat/style/main.css b/swat/style/columns.css
index 791a89d9e0..c3be8cbf65 100644
--- a/swat/style/main.css
+++ b/swat/style/columns.css
@@ -1,15 +1,30 @@
-/* main.css */
+/*
+	columns.css
+	Copyright (C) 2004-2005 Deryck Hodge <deryck@samba.org>
+
+	Creates a puesdo-three-column view.
+
+	You may freely use and modify the styles here, but if you 
+	intend to recreate the samba.org look exactly, please ask
+	permission first.
+*/
+
 
-		/******* Links for right-hand side of the page ******/
-		/****************************************************/
+/* Right-side column 
+***********************************************************/
 #links {
-	float:right;
-	margin:115px 1em 0 0;  
+	float:left;
+	margin:115px 0 0 81%;  
 	padding:0;
-    width:173px;
+    width:18%;
 }
-* html #links { 	/* Applies to IE5/6 only */
-	margin:115px .5% 0 0;
+* html #links {
+	position:absolute;
+	top:115px;
+	left:82%;
+	float:none;
+	width:17%;
+	margin:0;
 }
 #links h4 {
 	margin-top:10px;
@@ -47,32 +62,37 @@
 .contacts li{
 	list-style-type:disc;
 }
-		/****** Formats the page layout ********************/
-		/**************************************************/ 
-#content>.center {
-	min-height:800px;
-	z-index:0;
-}
-.center {
-	margin:0 22% 0 175px;
-	padding-top:130px;
+
+
+/* Middle content column
+***********************************************************/
+#content {
+	position:absolute;
+	top:100px;
+	margin:0 20% 0 175px;
+	padding-top:30px;
 	padding-left:35px;
 	padding-bottom:50px;
 	padding-right:15px;
 	background-color:#FFF;
 	border-left:1px solid #FFFF64;
 	border-right:1px solid #FFFF64;
-	z-index:-1;
 }
-.center ul {
+* html #content {
+	width:51%;
+	margin-right:0;
+}
+#content ul {
 	list-style-type:none;
 }
+
+
+/* Misc
+************************************************************/
 .headline {
         margin-left:20px;
         font-style:italic;
 }
-		/*********T-shirts and mirror footnotes *************/
-		/****************************************************/
 .plugs {
 	font-style:italic;
 	text-align:center;
@@ -105,19 +125,3 @@
     text-align:center;
     margin:10px 0 25px 0;
 }
-
-/*
-	styles for data tables
-*/
-table.data {
-	   border: 2px;
-}
-table.data th {
-	margin-top:20px;
-	text-align:left;
-        background-color: #F5C915;
-}
-table.data tr {
-        background-color: #E5C995;
-	text-align:left;
-}
diff --git a/swat/style/common.css b/swat/style/common.css
index 58406ccc40..6b4fa65a4c 100644
--- a/swat/style/common.css
+++ b/swat/style/common.css
@@ -1,15 +1,45 @@
-/* common.css */
+/* 
+	common.css
+	Copyright (C) 2004-2005 Deryck Hodge <deryck@samba.org>
 
-	/********* Basic elements across the site **********/
-	/***************************************************/
+	Basic styles common to all of samba.org, including VirtualHosts
+	bugzilla.samba.org, build.samba.org, and news.samba.org.
 
+	You may freely use and modify the styles here, but if you 
+	intend to recreate the samba.org look exactly, please ask
+	permission first.
+*/
+
+
+/* Base elements
+***********************************************************/
 body {
+	background:url(/images/stripes.png) repeat-x 0 0;
 	margin:0;
+	padding:0;
 	background-color:#E5E9F5;
 	font-family:Lucidasans, Helvetica, Verdana, sans-serif;
 	font-size:medium;
 	color:#000;
 }
+body#news  {
+	background:none;
+	background-color:#FFF;
+}
+blockquote {				
+	margin:35px;			
+	padding:15px; 			
+	border-left:2px groove #CCC;
+	border-top:2px groove #CCC;
+}
+img {
+	border:0;
+}
+
+
+
+/* Headings
+***********************************************************/
 h1 {
 	font-size:x-large;
 }
@@ -42,6 +72,17 @@ h6 {
 h6 a {
 	margin-right:3px;
 }
+
+
+/* Lists
+***********************************************************/
+ol li {
+	margin-bottom:12px;
+}
+
+
+/* Tables
+***********************************************************/
 table.real thead { 
         background-color: #E5E9F5;
 }
@@ -58,50 +99,30 @@ a:link:hover {
 	color:#CC0033;
 	background-color:#FFFF64;
 }
-ol li {
-	margin-bottom:12px;
-}
-blockquote {				
-	margin:35px;			
-	padding:15px; 			
-	border-left:2px groove #CCC;
-	border-top:2px groove #CCC;
-}
-img {
-	border:0;
-}
-.punch {  			/*creates a bold typeface */
-	font-weight:bold;
-}
 
-	/********************* header styles *******************************/
-	/******************************************************************/
+
+/* Header (yellow and blue stripes)
+***********************************************************/
 #banner {
 	position:absolute;
 	top:0;
 	left:0;
-	height:90px;
+	height:95px;
 	width:100%;
 	padding-top:4px;
-	background-color:#FFFF64;
+	z-index:1;
 }
-.logout {
+.srch {
 	text-align:right;
-
+  margin:0 5px 0 0;
 }
-.logout form {
+.srch form {
 	display:inline;
 }
-.stripe {
-	position:absolute;
-	top:40px;
-	left:0;
-	height:55px;
-	width:100%;
-	background-color:#3878CD;
-	border-top:2px solid #575756;
-	border-bottom:2px solid #575756;
-}
+
+
+/* Slogan ("Opening windows to a wider world")
+***********************************************************/
 .slogan {
 	position:absolute;
 	left:187px;
@@ -117,8 +138,9 @@ html>body .slogan { 	/**** Opera needs its own rule *********/
 	top:100px;
 }
 
-		/******** PNG logo with transparency across browsers  */
-		/******************************************************/
+
+/* Logo (with hacks for PNG transparency across browsers)
+***********************************************************/
 #logo>.logo_hack {
 	background-image:url(/images/logo.png);
 	background-position:center;
@@ -132,14 +154,16 @@ html>body .slogan { 	/**** Opera needs its own rule *********/
 	height:119px;
 	padding:0;
 	margin:0;
+	z-index:1;
 }
 .logo_hack a:hover {
 	background:transparent;
 }
 
-		/******** Main nav menu styles ****************/
-		/**********************************************/
-.nav {
+
+/* Nav menu
+***********************************************************/
+#nav {
 	position:absolute;
 	top:152px;
 	left:20px;
@@ -151,35 +175,45 @@ html>body .slogan { 	/**** Opera needs its own rule *********/
 	margin:0;
 	z-index:1;
 }
-.nav ul {
+#nav ul {
 	list-style-type:none;
 	text-align:center;
 	padding:0;
 	margin:0;
 }
-.nav a,
-.nav a:link,
-.nav a:visited {
+#nav a,
+#nav a:link,
+#nav a:visited {
 	display:block;
 	height:20px;
 	font-size:small;
 	color:#2B5C9F;
 }
-.nav a:hover {
+#nav a:hover {
 	color:#FFF;
 	background-color:#3878CD;
 }
-.nav a:active {
+#nav a:active {
 	color:#FFFF64;
 	background-color:#3878CD;
 	font-size:14px;
 }
-.nav img {
+#nav img {
 	padding:0;
 	margin:0;
 	width:180px;
 	height:30px;
 }
+
+
+/* Text and alignment formats
+***********************************************************/
+.punch {
+	font-weight:bold;
+}
+.tilt {
+	font-style:italic;
+}
 .colophon {
 	margin-left:20px;
 }
diff --git a/swat/style/swat.css b/swat/style/swat.css
new file mode 100644
index 0000000000..0c8f720003
--- /dev/null
+++ b/swat/style/swat.css
@@ -0,0 +1,32 @@
+/*
+	swat.css
+	
+	Styles added to the samba.org stylesheets 
+	specifically for SWAT.
+*/
+
+
+/* Forms
+***********************************************************/
+.logout {
+	text-align:right;
+}
+.logout form {
+	display:inline;
+}
+
+
+/* Tables
+***********************************************************/
+table.data {
+	   border: 2px;
+}
+table.data th {
+	margin-top:20px;
+	text-align:left;
+        background-color: #F5C915;
+}
+table.data tr {
+        background-color: #E5C995;
+	text-align:left;
+}
diff --git a/swat/style/wide.css b/swat/style/wide.css
new file mode 100644
index 0000000000..0107b33698
--- /dev/null
+++ b/swat/style/wide.css
@@ -0,0 +1,113 @@
+/*
+	wide.css
+	Copyright (C) 2004-2005 Deryck Hodge <deryck@samba.org>
+
+	An alternate two-column "wide" style for those pages
+	with lots and lots of text (download, devel, etc.)
+
+	You may freely use and modify the styles here, but if you 
+	intend to recreate the samba.org look exactly, please ask
+	permission first.
+*/
+
+
+/* Primary content section 
+***********************************************************/
+#content {
+	position:absolute;
+	top:100px;
+	clear:left;
+	margin:0 1% 0 175px;
+	padding-top:30px;
+	padding-left:35px;
+	padding-bottom:50px;
+	padding-right:15px;
+	background-color:#FFF;
+	border-left:1px solid #FFFF64;
+	border-right:1px solid #FFFF64;
+}
+* html #content {
+	width:70%;
+}
+#content h4 {
+	font-weight:bold;
+	margin:50px 10px 15px 0;
+}
+pre {
+    margin:15px 0 30px 5px;
+}    
+
+
+/* Team section
+***********************************************************/
+.teampic {
+	text-align:center;
+}
+.teampic img {
+	width:431px;
+	height:300px;
+}
+
+
+/* Release history/Release notes
+***********************************************************/
+.notes {
+	position:absolute;
+	top:265px;
+	left:0;
+}
+.notes h6 {
+    text-align:left;
+    margin:10px 5px;
+}
+.notes ul {
+	list-style-type:none;
+	text-align:left;
+	padding-left:12px;
+	margin:0 0 0 10px;
+	font-size:10px;
+}
+.intro {
+	margin-top:30px;
+}
+.headline {
+	margin-left:20px;
+	font-style:italic;
+}
+.latest ul {
+	list-style-type:none;
+	margin-left:40px;
+}
+
+
+/* Support providers pages
+***********************************************************/
+#countries {
+	float:left;
+	margin:240px 0 0 5px;
+	padding:0;
+	background-color:#E5E9F5;
+}
+#countries ul {
+	list-style-type:none;
+}
+#countries a {
+	font-size:small;
+}
+#countries h4 {
+	margin-top:10px;
+	margin-left:1px;
+	font-size:small;
+}
+.disclaimer {
+	margin:30px;
+	font-style:italic;
+}
+.info {
+	margin:75px 15px 15px 15px;
+	padding:10px;
+	font-size:small;
+	border-top:1px dotted #3878CD;
+	border-bottom:1px dotted #3878CD;
+}
+