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

git-svn-id: file:///home/svn/samba-web/trunk@747 44aeb9d7-1cd8-0310-b257-a505e0beeac2

diff --git a/header_columns.html b/header_columns.html
index 58d6b056757ae5fe01af04f87b30cb1146d1874d..0e78c78f140e8b34ca361c5e9420e3ee97f4f4a7 100755 (executable)
--- a/header_columns.html
+++ b/header_columns.html
@@ -72,7 +72,7 @@ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
   <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>

diff --git a/header_wide.html b/header_wide.html
index 3b0282f5cf64d3c9546cc9986f49127bec83f674..fef8d21a25891e93b54e4830a03103c1c62f93a5 100755 (executable)
--- a/header_wide.html
+++ b/header_wide.html
@@ -71,7 +71,7 @@ o.png',sizingMethod='scale');
   <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>

diff --git a/history/header_history.html b/history/header_history.html
index eb1ec15ec334528b0217e8cf545f02cda9f84647..dd9b49d62a42111937c91060026fd814b8bbe682 100755 (executable)
--- a/history/header_history.html
+++ b/history/header_history.html
@@ -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>

diff --git a/js/initPage.js b/js/initPage.js
index 3f73d7a741e2a563a1dd4311887cd018910e885b..a8a02b4f218b22e1944e527b1a10a4cd82cebf21 100644 (file)
--- a/js/initPage.js
+++ b/js/initPage.js
@@ -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

diff --git a/js/pageTweaks.js b/js/pageTweaks.js
index b05eeda79c25836e1dfaf0d9c3f651e6c0692cfd..d79a29467e2aa5431d45aa811dc8594c9f0e26a1 100644 (file)
--- a/js/pageTweaks.js
+++ b/js/pageTweaks.js
@@ -39,6 +39,8 @@ function setContentLen()
                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 @@ function setContentLen()
        }
 
        // 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; 

diff --git a/style/common.css b/style/common.css
index 6904500b6d5d65927905ccdd5aba9cff380d505b..c7f67b060f69b2b7aadb96efdacfd3079e3f08b1 100644 (file)
--- a/style/common.css
+++ b/style/common.css
@@ -163,7 +163,7 @@ html>body .slogan {         /**** Opera needs its own rule *********/
 
 /* Nav menu
 ***********************************************************/
-.nav {
+#nav {
        position:absolute;
        top:152px;
        left:20px;
@@ -175,30 +175,30 @@ 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;

diff --git a/support/header_support.html b/support/header_support.html
index 4f21ec9d51c2f6be8ed985d27442f3607568c418..671dd4099a2e5e9c1509e6b42f3b43870cff09c0 100755 (executable)
--- a/support/header_support.html
+++ b/support/header_support.html
@@ -64,7 +64,7 @@
 </div>
 
   
-<div class="nav">
+<div id="nav">
   
   <img src="/samba/images/help.png" alt="get help with samba" />
   <ul>