svn commit: samba-web r747 - in trunk: . history js style support

[deryck at samba.org]

Author: deryck
Date: 2005-07-14 16:30:00 +0000 (Thu, 14 Jul 2005)
New Revision: 747

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=747

Log:
setContentLen() needs to account for pages without right-side
sidebars, too.  Had to change nav menu to an id instead of class
to make this work.

If you see formatting problems the next day or two, hard reload
the page to pull fresh stylesheets.  Sorry for this, but had to 
fix the bug.

deryck 

Modified:
   trunk/header_columns.html
   trunk/header_wide.html
   trunk/history/header_history.html
   trunk/js/initPage.js
   trunk/js/pageTweaks.js
   trunk/style/common.css
   trunk/support/header_support.html


Changeset:
Modified: trunk/header_columns.html
===================================================================
--- trunk/header_columns.html	2005-07-14 16:10:57 UTC (rev 746)
+++ trunk/header_columns.html	2005-07-14 16:30:00 UTC (rev 747)
@@ -72,7 +72,7 @@
   <h4>Opening Windows to a Wider World</h4>
 </div>
 
-<div class="nav">
+<div id="nav">
   
   <img src="/samba/images/think.png" alt="think samba" />
   <ul>

Modified: trunk/header_wide.html
===================================================================
--- trunk/header_wide.html	2005-07-14 16:10:57 UTC (rev 746)
+++ trunk/header_wide.html	2005-07-14 16:30:00 UTC (rev 747)
@@ -71,7 +71,7 @@
   <h4>Opening Windows to a Wider World</h4>
 </div>
 
-<div class="nav">
+<div id="nav">
   
   <img src="/samba/images/think.png" alt="think samba" />
   <ul>

Modified: trunk/history/header_history.html
===================================================================
--- trunk/history/header_history.html	2005-07-14 16:10:57 UTC (rev 746)
+++ trunk/history/header_history.html	2005-07-14 16:30:00 UTC (rev 747)
@@ -65,7 +65,7 @@
 
 <div id="left_border">
 
-  <div class="nav">
+  <div id="nav">
     <img src="/samba/images/release.png" alt="release samba" />
     <ul>
     <li><a href="/samba/index.html">Samba-Web Home</a></li>

Modified: trunk/js/initPage.js
===================================================================
--- trunk/js/initPage.js	2005-07-14 16:10:57 UTC (rev 746)
+++ trunk/js/initPage.js	2005-07-14 16:30:00 UTC (rev 747)
@@ -22,12 +22,8 @@
 
 window.onload = function init()
 {
-	// Set the center column length when its shorter than
-	// the sidebars,  Currently, only happens on support
-	// and 3-column pages.
-	if (document.getElementById('links') || document.getElementById('countries')) {
-		setContentLen();
-	}
+	// Set center column length longer than sidebars
+	setContentLen();
 
 	// Always load the "Choose a Mirror" option bu default
 	document.mirrorForm.mirrorLocation.selectedIndex=0

Modified: trunk/js/pageTweaks.js
===================================================================
--- trunk/js/pageTweaks.js	2005-07-14 16:10:57 UTC (rev 746)
+++ trunk/js/pageTweaks.js	2005-07-14 16:30:00 UTC (rev 747)
@@ -39,6 +39,8 @@
 		sidebar = document.getElementById('links');
 	} else if (document.getElementById('countries')) {
 		sidebar = document.getElementById('countries'); 
+	} else if (document.getElementById('nav')) {
+		sidebar = document.getElementById('nav');
 	}
 
 	// Get the sidebar height as integer
@@ -53,7 +55,8 @@
 	}
 
 	// Allow for the extra top margin value
-	if (document.getElementById('links')) {
+	if (document.getElementById('links') || 
+		    document.getElementById('nav')) {
 		sidebarY = sidebarY + 115;
 	} else if (document.getElementById('countries')) {
 		sidebarY = sidebarY + 240; 

Modified: trunk/style/common.css
===================================================================
--- trunk/style/common.css	2005-07-14 16:10:57 UTC (rev 746)
+++ trunk/style/common.css	2005-07-14 16:30:00 UTC (rev 747)
@@ -163,7 +163,7 @@
 
 /* Nav menu
 ***********************************************************/
-.nav {
+#nav {
 	position:absolute;
 	top:152px;
 	left:20px;
@@ -175,30 +175,30 @@
 	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;

Modified: trunk/support/header_support.html
===================================================================
--- trunk/support/header_support.html	2005-07-14 16:10:57 UTC (rev 746)
+++ trunk/support/header_support.html	2005-07-14 16:30:00 UTC (rev 747)
@@ -64,7 +64,7 @@
 </div>
 
   
-<div class="nav">
+<div id="nav">
   
   <img src="/samba/images/help.png" alt="get help with samba" />
   <ul>