Looks worse than it is... just touching every file for one change.
authorDeryck Hodge <deryck@samba.org>
Tue, 3 May 2005 16:06:48 +0000 (16:06 +0000)
committerDeryck Hodge <deryck@samba.org>
Tue, 3 May 2005 16:06:48 +0000 (16:06 +0000)
Using javascript to dynamically write titles to the header.
This keeps us from having to use multiple headers and
really simplies our header setup now.  Still allows
page specific titles in the browser.

deryck

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

59 files changed:
GUI/index.html
archive-policy.html
archives.html
books.html
buglist.html
bugreports.html
colophon.html
contacts.html
courses.html
cvs.html
devel/TODO.html
devel/header_devel.html [deleted file]
devel/index.html
devel/roadmap-3.html
devel/roadmap-4.0.html
docs/10years.html
docs/FAQ/index.html
docs/GPL.html
docs/anecdotes.html
docs/header_docs.html [deleted file]
docs/index.html
docs/myths_about_samba.html
docs/server_security.html
docs/swat_ssl.html
donations.html
download/ftp_mirrors.html
download/header_download.html [deleted file]
download/index.html
ghindex.html
header.html
header2.html
header_wide.html [moved from GUI/header_gui.html with 83% similarity]
history/header_history.html
history/index.html
history/security.html
index.html
irc.html
mirroring.html
ml-etiquette.html
ms_license.html
ntsystems.html
search.html
security/index.html
smbfs/index.html
subversion.html
support/header_support.html
support/index.html
team/header_team.html [deleted file]
team/index.html
team/team2002.html
team/team98.html
team/tshirt.html
testpage.html
thanks.html
tng.html
top_level_template
vendors/header_vendors.html [deleted file]
vendors/index.html
what_is_samba.html

index d85f229..ed089bd 100755 (executable)
@@ -1,6 +1,4 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba GUI Information</title>
-<!--#include virtual="header_gui.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
 
 <h2>Samba GUI page</h2>
 
index 5df01e5..5cd7c61 100644 (file)
@@ -1,6 +1,4 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba - Policy for Archiving Mailing Lists</title>
-<!--#include virtual="/samba/header2.html" -->
 
 <h2 align="center">Samba list archive editing policy</h2>
 
index 3c661ee..0d7146b 100755 (executable)
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>Samba - Mailing List Archives</title>
-<!--#include virtual="/samba/header2.html" -->
+
 
 <h2>Samba Mailing Lists</h2>
 
index 0a0b5fd..1d88d4c 100755 (executable)
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Books on Samba, by year</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<H2 align="center">Samba books</H2>
+<h2>Samba books</h2>
 
 <p>There are now quite a number of books becoming available for Samba and
 we, the Samba Team, felt that it would be useful if a list of them was
index ca26010..a2a631a 100755 (executable)
@@ -1,7 +1,6 @@
 <!--#include virtual="/samba/header.html" -->
 
-
-<h2 align="center">Recent bugs list</h2>
+<h2>Recent bugs list</h2>
 
 <br>
 <p>This is a list of the most relevant bugs found in the samba code.<br>
index 971577e..ac3a327 100755 (executable)
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba Bug Report HOWTO</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<H2 align="center">Bug Reports, Patches  &amp; contacting the Samba Team</H2>
+<h2>Bug Reports, Patches  &amp; contacting the Samba Team</h2>
 
 <BR><p> The Samba Team have recently implemented an
 improved Bug Tracking System (using <A
index 5944e57..ed67368 100755 (executable)
@@ -1,6 +1,4 @@
 <!--#include virtual="/samba/header.html" -->
-<title>samba.org, version 3</title>
-<!--#include virtual="/samba/header2.html" -->
 
     <h2>A Redesigned samba.org</h2>
     
index 75e809f..8103603 100755 (executable)
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>Samba Contacts</title>
-<!--#include virtual="/samba/header2.html" -->
+
 
 <h2>Contacts for...</h2>
 
index f641991..4f81aa4 100755 (executable)
@@ -1,14 +1,15 @@
 <!--#include virtual="/samba/header.html" -->
 
-<H2 align="center">Samba Courses</H2>
+<h2>Samba Courses</h2>
 There are now a number of people offering Samba courses.  Here we list those 
 that we are aware of.  If you are aware of any other Samba course, please
-send mail to <A HREF="mailto:rsharpe@ns.aus.com">Richard Sharpe</A>.
+send mail to <a href="mailto:rsharpe@ns.aus.com">Richard Sharpe</a>.
 <p>
 We will insert a reference here to the web site that describes the courses.  
 The Samba team in no way endorses any of these courses.
 <ul>
-<li>Two 1-day Samba courses, by Richard Sharpe
-<li>A German-language Samba course, by Volker Lendecke
+<li>Two 1-day Samba courses, by Richard Sharpe</li>
+<li>A German-language Samba course, by Volker Lendecke</li>
 </ul>
+
 <!--#include virtual="/samba/footer.html" -->
index bdc4c45..16c5394 100755 (executable)
--- a/cvs.html
+++ b/cvs.html
@@ -1,9 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba - CVS Instructions</title>
-<!--#include virtual="/samba/header2.html" -->
 
-
-<h2 align="center">CVS Access to pserver.samba.org</h2>
+<h2>CVS Access to pserver.samba.org</h2>
 
 
 <H1>samba development changed to subversion</H1>
index 86be529..d30f99f 100755 (executable)
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba Development TODO List</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<H2 ALIGN=CENTER>Development List of Projects</H2>
+<h2>Development List of Projects</h2>
 
 <p>Samba is developed by hard work from a world-wide team of volunteers.  This page provides a list of on-going projects within Samba development, and offers information about how to get involved.  Be sure to read the <a href="/samba/devel/">development page</a> regarding responsibly submitting patches.</p>  
 <br />
diff --git a/devel/header_devel.html b/devel/header_devel.html
deleted file mode 100755 (executable)
index 3fc5167..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-<link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/samba/style/wide.css" type="text/css" media="all" />
-<link rel="shortcut icon" href="/samba/images/favicon.ico" />
-
-<!--[if gte IE 5.5]>
-        <style type="text/css">
-        /*<![CDATA[*/
-        .logo_hack {
-filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
-o.png',sizingMethod='scale');
-        }
-        /*]]>*/
-        </style>
-<![endif]-->
-
-<!--[if lte IE 5]>
-        <style type="text/css">
-        /*<![CDATA[*/
-        .logo_hack {
-        background-image:url(/samba/images/logo.gif);
-        background-position:center;
-        background-repeat:no-repeat;
-        top:23.5px;
-        left:-10px;
-        }
-        /*]]>*/
-        </style>
-<![endif]-->
-
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-        mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value
-
-        if (mirrorSite != "") {
-                document.location.href = mirrorSite
-                }
-   }
-// end hide -->
-</script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<meta name="keywords" content="Samba SMB CIFS" />
-<meta name="description" content="Home of Samba, the SMB file server" />
-
-</head>
-
-
-<body onload="document.mirrorForm.mirrorLocation.selectedIndex=0">
-
-<div id="banner">
-  <div class="stripe"></div>
-
-  <div class="srch">
-  <h5>search samba.org:</h5>
-  <form method="post" action="http://de.samba.org/cgi-bin/htsearch">
-  <input type="text" size="15" name="words" value="" />
-  <input type="submit" value="Go" />
-  </form>
-  <span>|</span>
-  <form action="no_script_required.cgi" name="mirrorForm">
-    <select name="mirrorLocation" onchange="changeMirror(this.form.mirrorLocation)">
-    <option selected="selected">Choose A Mirror</option>
-    <!--#include virtual="/samba/menu_options.html" -->
-    </select>
-   </form>
-  </div>
-</div>
-
-<div id="logo">
-  <div class="logo_hack"><a href="/samba/"><img src="/samba/images/linkpad.gif" alt="Samba" /></a></div>
-</div>
-
-<div class="slogan">
-  <h4>Opening Windows to a Wider World</h4>
-</div>
-
-<div class="nav">
-
-  <img src="/samba/images/think.png" alt="think samba" />
-  <ul>
-  <li><a href="/samba/what_is_samba.html">What Is Samba?</a></li>
-  <li><a href="http://news.samba.org/">Latest News</a></li>
-  <li><a href="/samba/docs/FAQ/">FAQ</a></li>
-  </ul>
-
-  <img src="/samba/images/get.png" alt="get samba" />
-  <ul>
-  <li><a href="/samba/download/">Download Info</a></li>
-  <li><a href="/samba/ftp/Binary_Packages/">Binaries</a></li>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/install.html">How To Install</a></li>
-  <li><a href="/samba/GUI/">GUIs</a></li>
-  </ul>
-
-  <img src="/samba/images/learn.png" alt="learn samba" />
-  <ul>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/">Official HOWTO</a></li>
-  <li><a href="/samba/docs/man/Samba-Guide/">By Example</a></li>
-  <li><a href="/samba/docs/using_samba/toc.html">Using Samba</a></li>
-  <li><a href="/samba/docs/">Docs And Books</a></li>
-  </ul>
-
-  <img src="/samba/images/talk.png" alt="talk samba" />
-  <ul>
-  <li><a href="http://lists.samba.org">List Subscribe</a></li>
-  <li><a href="/samba/archives.html">List Archives</a></li>
-  <li><a href="/samba/irc.html">IRC</a></li>
-  <li><a href="/samba/ml-etiquette.html">Etiquette</a></li>
-  </ul>
-
-  <img src="/samba/images/hack.png" alt="hack samba" />
-  <ul>
-  <li><a href="/samba/devel/">Devel Overview</a></li>
-  <li><a href="http://websvn.samba.org">SVN Source</a></li>
-  <li><a href="http://cvs.samba.org/cgi-bin/cvsweb/">Historical CVS Source</a></li>
-  <li><a href="http://build.samba.org/">Build Farm</a></li>
-  <li><a href="https://bugzilla.samba.org">Bug Reports</a></li>
-  </ul>
-
-  <img src="/samba/images/contact.png" alt="contact samba" />
-  <ul>
-  <li><a href="/samba/team/">Samba Team</a></li>
-  <li><a href="/samba/donations.html">Donations</a></li>
-  <li><a href="/samba/team/tshirt.html">T-shirts, etc</a></li>
-  <li><a href="/samba/contacts.html">Contacts For...</a></li>
-  </ul>
-
-</div>
-
-<div id="content">
-  <div class="center">
-
index 089fc6d..8f94f3d 100644 (file)
@@ -1,6 +1,5 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba Development</title>
-<!--#include virtual="header_devel.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
+
 <h2>Development</h2>
 
 <p>devel.samba.org contains information about the current state of Samba development. It should be of interest to those developing Samba as well as to those following Samba development.</p>
index 6cd92df..f74235e 100755 (executable)
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba 3.0 Roadmap</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<h3>Current development branches</h3>
+<h2>Current development branches</h2>
 
 <p>At the moment, development is ongoing in the following CVS branches: 
 <ul>
index 076390a..77fb3da 100644 (file)
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba 4.0 Roadmap</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<h2 align="center">Roadmap to Samba 4.0.0</h2>         
+<h2>Roadmap to Samba 4.0.0</h2>                
 
 <p align="right"><em>Page Last Updated</em>: 24 February 2005</p>
 
index ac890a4..25f1bb2 100755 (executable)
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" -->
 
-<H2 align="center">10 years of Samba!</H2>
+<h2>10 years of Samba!</h2>
 
 Who would have believed that <a
 href="http://groups.google.com/groups?q=tridge&scoring=d&as_drrb=b&as_mind=1&as_minm=1&as_miny=1992&as_maxd=17&as_maxm=1&as_maxy=1992&selm=1992Jan10.091323.17768%40newshost.anu.edu.au&rnum=5">this
index b8cd1de..a0b81ae 100755 (executable)
@@ -1,7 +1,4 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba FAQ </title>
-<!--#include virtual="/samba/header2.html" -->
-
 
 <h2>Frequently Asked Questions</h2>
 
index 6cff722..994f1aa 100755 (executable)
@@ -1,6 +1,4 @@
 <!--#include virtual="/samba/header.html" -->
-<title>GPL on Samba.org</title>
-<!--#include virtual="/samba/header2.html" -->
 
 <pre>
 <!--#include virtual="/samba/ftp/COPYING" -->
index 9f1bc95..582a75a 100755 (executable)
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" -->
 
-<H2 ALIGN="CENTER">Samba Anecdotes!</H2>
+<h2>Samba Anecdotes!</h2>
 
 <H3 ALIGN=CENTER>...regarding the Linux Penguin mascot</H3>
 
diff --git a/docs/header_docs.html b/docs/header_docs.html
deleted file mode 100755 (executable)
index 7c9246f..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-
-<link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/samba/style/wide.css" type="text/css" media="all" />
-<link rel="shortcut icon" href="/samba/images/favicon.ico" />
-
-<!--[if gte IE 5.5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
-o.png',sizingMethod='scale');
-       }
-       /*]]>*/ 
-       </style>
-<![endif]-->
-
-<!--[if lte IE 5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-       background-image:url(/samba/images/logo.gif);
-       background-position:center;
-       background-repeat:no-repeat;
-       top:23.5px;
-       left:-10px;
-       }
-       /*]]>*/
-        </style>
-<![endif]-->
-
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-       mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value 
-       
-       if (mirrorSite != "") { 
-               document.location.href = mirrorSite 
-               } 
-   }
-// end hide -->
-</script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<meta name="keywords" content="Samba SMB CIFS" />
-<meta name="description" content="Home of Samba, the SMB file server" />
-
-</head>
-
-
-<body onload="document.mirrorForm.mirrorLocation.selectedIndex=0">
-
-<div id="banner">
-  <div class="stripe"></div>
-  
-  <div class="srch">
-  <h5>search samba.org:</h5>
-  <form method="post" action="http://de.samba.org/cgi-bin/htsearch">
-  <input type="text" size="15" name="words" value="" />
-  <input type="submit" value="Go" />
-  </form>
-  <span>|</span>
-  <form action="no_script_required.cgi" name="mirrorForm">
-    <select name="mirrorLocation" onchange="changeMirror(this.form.mirrorLocation)">
-    <option selected="selected">Choose A Mirror</option>
-    <!--#include virtual="/samba/menu_options.html" --> 
-    </select>
-   </form>
-  </div>
-</div>
-
-<div id="logo">
-  <div class="logo_hack"><a href="/samba/"><img src="/samba/images/linkpad.gif" alt="Samba" /></a></div>
-</div>
-
-<div class="slogan">
-  <h4>Opening Windows to a Wider World</h4>
-</div>
-
-<div class="nav">
-  
-  <img src="/samba/images/think.png" alt="think samba" />
-  <ul>
-  <li><a href="/samba/what_is_samba.html">What Is Samba?</a></li>
-  <li><a href="http://news.samba.org/">Latest News</a></li>
-  <li><a href="/samba/docs/FAQ/">FAQ</a></li>
-  </ul>
-    
-  <img src="/samba/images/get.png" alt="get samba" />
-  <ul>  
-  <li><a href="/samba/download/">Download Info</a></li>
-  <li><a href="/samba/ftp/Binary_Packages/">Binaries</a></li>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/install.html">How To Install</a></li>
-  <li><a href="/samba/GUI/">GUIs</a></li>
-  </ul>
-    
-  <img src="/samba/images/learn.png" alt="learn samba" />
-  <ul>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/">Official HOWTO</a></li>
-  <li><a href="/samba/docs/man/Samba-Guide/">By Example</a></li>
-  <li><a href="/samba/docs/using_samba/toc.html">Using Samba</a></li>
-  <li><a href="/samba/docs/">Docs and Books</a></li>
-  </ul>
-    
-  <img src="/samba/images/talk.png" alt="talk samba" />
-  <ul>
-  <li><a href="http://lists.samba.org">List Subscribe</a></li>
-  <li><a href="/samba/archives.html">List Archives</a></li>
-  <li><a href="/samba/irc.html">IRC</a></li>
-  <li><a href="/samba/ml-etiquette.html">Etiquette</a></li>
-  </ul>
-    
-  <img src="/samba/images/hack.png" alt="hack samba" />
-  <ul>
-  <li><a href="/samba/devel/">Devel Overview</a></li>
-  <li><a href="http://websvn.samba.org">SVN Source</a></li>
-  <li><a href="http://cvs.samba.org/cgi-bin/cvsweb/">Historical CVS Source</a></li>
-  <li><a href="http://build.samba.org/">Build Farm</a></li>
-  <li><a href="https://bugzilla.samba.org">Bug Reports</a></li>
-  </ul>
-    
-  <img src="/samba/images/contact.png" alt="contact samba" />
-  <ul>
-  <li><a href="/samba/team/">Samba Team</a></li>
-  <li><a href="/samba/donations.html">Donations</a></li>
-  <li><a href="/samba/team/tshirt.html">T-shirts, etc</a></li>
-  <li><a href="/samba/contacts.html">Contacts For...</a></li>
-  </ul>
-    
-</div>
-
-<div id="content">
-  <div class="center">
-
index 36af317..08a28a8 100755 (executable)
@@ -1,6 +1,4 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba Documentation</title>
-<!--#include virtual="header_docs.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
 
 <!-- $Revision: 1.76 $ -->
 
index 98a3d32..a1f6df8 100755 (executable)
@@ -1,6 +1,4 @@
 <!--#include virtual="/samba/header.html" -->
-  <title>Myths About Samba</title>
-<!--#include virtual="header_docs.html" -->
 
     <h3><b>Myths About Samba</b></h3>
 
index 3b8cd1a..cf1f7d3 100755 (executable)
@@ -1,6 +1,4 @@
-<!--#include virtual="/samba/header.html" -->
-<title>Samba Server Security</title>
-<!--#include virtual="header_docs.html" -->
+<!--#include virtual="/samba/header_wide.html" -->
 
   <h2>Protecting an unpatched Samba server</h2>
 
index af92913..a97d282 100755 (executable)
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" -->
 
-<h2 align="center">SWAT and SSL</h2>
+<h2>SWAT and SSL</h2>
 
 Lots of people have asked about how to setup SWAT with SSL to allow
 for secure remote administration of Samba. Here is a method that
index e1bf5aa..1a3bd5a 100755 (executable)
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>Donations to Help Support Samba</title>
-<!--#include virtual="/samba/header2.html" -->
+
 
 <h2>samba.org donations</h2>
 
index 45e50c8..385e757 100755 (executable)
@@ -1,6 +1,4 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba Download Sites</title>
-<!--#include virtual="header_download.html" -->
 
 <h2>ftp Mirror Sites</h2>
 
diff --git a/download/header_download.html b/download/header_download.html
deleted file mode 100755 (executable)
index bfdcc21..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-
-<link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/samba/style/wide.css" type="text/css" media="all" />
-<link rel="shortcut icon" href="/samba/images/favicon.ico" />
-
-<!--[if gte IE 5.5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
-o.png',sizingMethod='scale');
-       }
-       /*]]>*/ 
-       </style>
-<![endif]-->
-
-<!--[if lte IE 5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-       background-image:url(/samba/images/logo.gif);
-       background-position:center;
-       background-repeat:no-repeat;
-       top:23.5px;
-       left:-10px;
-       }
-       /*]]>*/
-        </style>
-<![endif]-->
-
-<script language="Javascript" type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-       mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value 
-       
-       if (mirrorSite != "") { 
-               document.location.href = mirrorSite 
-               } 
-   }
-// end hide -->
-</script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<meta name="keywords" content="Samba SMB CIFS" />
-<meta name="description" content="Home of Samba, the SMB file server" />
-
-</head>
-
-
-<body onload="document.mirrorForm.mirrorLocation.selectedIndex=0">
-
-<div id="banner">
-  <div class="stripe"></div>
-  
-  <div class="srch">
-  <h5>search samba.org:</h5>
-  <form method="post" action="http://de.samba.org/cgi-bin/htsearch">
-  <input type="text" size="15" name="words" value="" />
-  <input type="submit" value="Go" />
-  </form>
-  <span>|</span>
-  <form action="no_script_required.cgi" name="mirrorForm">
-    <select name="mirrorLocation" onchange="changeMirror(this.form.mirrorLocation)">
-    <option selected="selected">Choose A Mirror</option>
-    <!--#include virtual="/samba/menu_options.html" --> 
-    </select>
-   </form>
-  </div>
-</div>
-
-<div id="logo">
-  <div class="logo_hack"><a href="/samba/"><img src="/samba/images/linkpad.gif" alt="Samba" /></a></div>
-</div>
-
-<div class="slogan">
-  <h4>Opening Windows to a Wider World</h4>
-</div>
-
-<div id="left_border"></div>
-  
-<div class="nav">
-  
-  <img src="/samba/images/think.png" alt="think samba" />
-  <ul>
-  <li><a href="/samba/what_is_samba.html">What Is Samba?</a></li>
-  <li><a href="http://news.samba.org/">Latest News</a></li>
-  <li><a href="/samba/docs/FAQ/">FAQ</a></li>
-  </ul>
-    
-  <img src="/samba/images/get.png" alt="get samba" />
-  <ul>  
-  <li><a href="/samba/download/">Download Info</a></li>
-  <li><a href="/samba/ftp/Binary_Packages/">Binaries</a></li>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/install.html">How To Install</a></li>
-  <li><a href="/samba/GUI/">GUIs</a></li>
-  </ul>
-    
-  <img src="/samba/images/learn.png" alt="learn samba" />
-  <ul>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/">Official HOWTO</a></li>
-  <li><a href="/samba/docs/man/Samba-Guide/">By Example</a></li>
-  <li><a href="/samba/docs/using_samba/toc.html">Using Samba</a></li>
-  <li><a href="/samba/docs/">Docs and Books</a></li>
-  </ul>
-    
-  <img src="/samba/images/talk.png" alt="talk samba" />
-  <ul>
-  <li><a href="http://lists.samba.org">List Subscribe</a></li>
-  <li><a href="/samba/archives.html">List Archives</a></li>
-  <li><a href="/samba/irc.html">IRC</a></li>
-  <li><a href="/samba/ml-etiquette.html">Etiquette</a></li>
-  </ul>
-    
-  <img src="/samba/images/hack.png" alt="hack samba" />
-  <ul>
-  <li><a href="/samba/devel/">Devel Overview</a></li>
-  <li><a href="http://websvn.samba.org">SVN Source</a></li>
-  <li><a href="http://cvs.samba.org/cgi-bin/cvsweb/">Historical CVS Source</a></li>
-  <li><a href="http://build.samba.org/">Build Farm</a></li>
-  <li><a href="https://bugzilla.samba.org/">Bug Reports</a></li>
-  </ul>
-    
-  <img src="/samba/images/contact.png" alt="contact samba" />
-  <ul>
-  <li><a href="/samba/team/">Samba Team</a></li>
-  <li><a href="/samba/donations.html">Donations</a></li>
-  <li><a href="/samba/team/tshirt.html">T-shirts, etc</a></li>
-  <li><a href="/samba/contacts.html">Contacts For...</a></li>
-  </ul>
-    
-</div>
-
-
-<div id="content">
-  <div class="center">
-
index f9a978c..4414ca2 100755 (executable)
@@ -1,6 +1,5 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Download Samba</title>
-<!--#include virtual="header_download.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
+
 <h2>Download</h2>
 
 <p>The Samba source code is distributed via ftp and http.  View the download
index 020090e..bae3094 100755 (executable)
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" -->
 
-<H2 align="center">Search the Samba Web Pages</H2>
+<h2>Search the Samba Web Pages</h2>
 
 <FORM ACTION="http://samba.org/cgi-bin/smbaglimpse/01">
 
index efeda16..00229bd 100755 (executable)
@@ -3,3 +3,191 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <head>
+
+<link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
+<link rel="stylesheet" href="/samba/style/main.css" type="text/css" media="all" />
+<link rel="shortcut icon" href="/samba/images/favicon.ico" />
+<link rel="alternate" href="/samba/news/sambanews.xml" type="application/rss+xml" title="Samba News" />
+
+<!--[if gte IE 5.5]>
+       <style type="text/css">
+       /*<![CDATA[*/
+       .logo_hack {
+filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/logo.png',sizingMethod='scale');
+       }
+       /*]]>*/ 
+       </style>
+<![endif]-->
+
+<!--[if lte IE 5]>
+       <style type="text/css">
+       /*<![CDATA[*/
+       .logo_hack {
+       background-image:url(/samba/images/logo.gif);
+       background-position:center;
+       background-repeat:no-repeat;
+       top:23.5px;
+       left:-10px;
+       }
+       /*]]>*/
+        </style>
+<![endif]-->
+
+<script src="/samba/js/siteWide.js" type="text/javascript"></script>
+<script src="/samba/js/initPage.js" type="text/javascript"></script>
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Language" content="en-us" />
+<meta name="keywords" content="Samba SMB CIFS" />
+<meta name="description" content="Home of Samba, the SMB file server" />
+
+</head>
+
+
+<body>
+
+<div id="banner">
+  <div class="stripe"></div>
+  
+  <div class="srch">
+  <h5>search samba.org:</h5>
+  <form method="post" action="http://de.samba.org/cgi-bin/htsearch">
+  <input type="text" size="15" name="words" value="" />
+  <input type="submit" value="Go" />
+  </form>
+  <span>|</span>
+  <form action="no_script_yet.cgi" name="mirrorForm">
+    <select name="mirrorLocation" onchange="changeMirror(this.form.mirrorLocation)">
+    <option selected="selected">Choose A Mirror</option>
+    <!--#include virtual="/samba/menu_options.html" --> 
+    </select>
+    <noscript>
+    <input type="submit" value="Go" />
+    </noscript>
+   </form>
+  </div>
+</div>
+
+<div id="logo">
+  <div class="logo_hack"><a href="/samba/"><img src="/samba/images/linkpad.gif" alt="Samba" /></a></div>
+</div>
+
+<div class="slogan">
+  <h4>Opening Windows to a Wider World</h4>
+</div>
+
+<div class="nav">
+  
+  <img src="/samba/images/think.png" alt="think samba" />
+  <ul>
+  <li><a href="/samba/what_is_samba.html">What Is Samba?</a></li>
+  <li><a href="http://news.samba.org/">Latest News</a></li>
+  <li><a href="/samba/docs/FAQ/">FAQ</a></li> 
+  </ul>
+    
+  <img src="/samba/images/get.png" alt="get samba" />
+  <ul>  
+  <li><a href="/samba/download/">Download Info</a></li>
+  <li><a href="/samba/ftp/Binary_Packages/">Binaries</a></li>
+  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/install.html">How To Install</a></li>
+  <li><a href="/samba/GUI/">GUIs</a></li>
+  </ul>
+    
+  <img src="/samba/images/learn.png" alt="learn samba" />
+  <ul>
+  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/">Official HOWTO</a></li>
+  <li><a href="/samba/docs/man/Samba-Guide/">By Example</a></li>
+  <li><a href="/samba/docs/using_samba/toc.html">Using Samba</a></li>
+  <li><a href="/samba/docs/">Docs And Books</a></li>
+  </ul>
+    
+  <img src="/samba/images/talk.png" alt="talk samba" />
+  <ul>
+  <li><a href="http://lists.samba.org">List Subscribe</a></li>
+  <li><a href="/samba/archives.html">List Archives</a></li>
+  <li><a href="/samba/irc.html">IRC</a></li>
+  <li><a href="/samba/ml-etiquette.html">Etiquette</a></li>
+  </ul>
+    
+  <img src="/samba/images/hack.png" alt="hack samba" />
+  <ul>
+  <li><a href="/samba/devel/">Devel Overview</a></li>
+  <li><a href="http://websvn.samba.org">SVN Source</a></li>
+  <li><a href="http://cvs.samba.org/cgi-bin/cvsweb/">Historical CVS Source</a></li>
+  <li><a href="http://build.samba.org/">Build Farm</a></li>
+  <li><a href="https://bugzilla.samba.org">Bug Reports</a></li>
+  </ul>
+    
+  <img src="/samba/images/contact.png" alt="contact samba" />
+  <ul>
+  <li><a href="/samba/team/">Samba Team</a></li>
+  <li><a href="/samba/donations.html">Donations</a></li>
+  <li><a href="/samba/team/tshirt.html">T-shirts, etc</a></li>
+  <li><a href="/samba/contacts.html">Contacts For...</a></li>
+  </ul>
+    
+</div>
+
+<div id="links">
+
+  <div class="releases">
+    <h4>Current Stable Releases</h4>
+    <ul>
+    <li><a href="/samba/ftp/samba-3.0.14a.tar.gz">Samba 3.0.14a (gzipped)</a></li>
+    <li><a href="/samba/history/samba-3.0.14a.html">Release Notes</a></li>
+    <li><a href="/samba/ftp/stable/samba-3.0.14a.tar.asc">Signature</a></li>
+    </ul>
+    
+    <h4>Historical</h4>
+    <ul>
+    <li><a href="/samba/ftp/stable/samba-2.2.12.tar.gz">Samba 2.2.12
+(gzipped)</a></li>
+    <li><a href="/samba/history/samba-2.2.12.html">Release Notes</a></li>
+    <li><a href="/samba/ftp/stable/samba-2.2.12.tar.asc">Signature</a></li>
+    </ul>
+       
+    <p><a href="/samba/history/">Release History</a></p>
+    
+    <p><a href="/samba/history/security.html">Security Updates</a></p>
+  </div>
+  
+  <div class="beyond">
+    <h4>Beyond samba.org</h4>
+    <ul>
+    <li><a href="/samba/support/">Commercial Support</a></li>
+    <li><a href="/samba/vendors/">Samba-related Products</a></li>
+    <li><a href="/samba/mirroring.html">Mirroring Info</a></li>
+    <li><a href="/samba/colophon.html">Samba-Web, version 3</a></li>
+    <li><a href="http://www.sambaxp.org/">sambaXP 2005</a></li>
+    </ul>
+  </div>
+  
+  <div class="related">
+    <h4>Related Sites</h4>
+    <ul>
+    <li><a href="http://linux-cifs.samba.org/">linux-cifs.samba.org</a></li>
+    <li><a href="http://samba-survey.sernet.de/">survey.samba.org</a></li>
+    <li><a href="http://jcifs.samba.org/">jcifs.samba.org</a></li>
+    <li><a href="http://rsync.samba.org/">rsync.samba.org</a></li>
+    <li><a href="http://ccache.samba.org/">ccache.samba.org</a></li>
+    <li><a href="http://distcc.samba.org/">distcc.samba.org</a></li>
+    <li><a href="http://ppp.samba.org/">ppp.samba.org</a></li>
+    </ul>
+  </div>
+
+  <div class="intl">
+    <h4>International Sites</h4>
+    <ul>
+    <li> Deutsch: <a href="http://samba.sernet.de/">samba.sernet.de</a></li>
+    <li> Italiano: <a href="http://samba.xsec.it/">samba.xsec.it</a></li>
+    <li> Hebrew: <a href="http://linux.israel.net/samba/samba.html">linux.israel.net</a></li>
+    <li> Chinese: <a href="http://hk.samba.org/">hk.samba.org</a></li>
+    </ul>
+  </div>
+    
+</div>
+
+<div id="content">
+  <div class="center">
+
index 46f82af..d7280a7 100755 (executable)
@@ -28,17 +28,8 @@ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
         </style>
 <![endif]-->
 
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-       mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value 
-       
-       if (mirrorSite != "") { 
-               document.location.href = mirrorSite 
-               } 
-   }
-// end hide -->
-</script>
+<script src="/samba/scripts/siteWide.js" type="text/javascript"></script>
+<script src="/samba/scripts/initPage.js" type="text/javascript"></script>
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Content-Language" content="en-us" />
@@ -48,7 +39,7 @@ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
 </head>
 
 
-<body onload="document.mirrorForm.mirrorLocation.selectedIndex=0">
+<body>
 
 <div id="banner">
   <div class="stripe"></div>
similarity index 83%
rename from GUI/header_gui.html
rename to header_wide.html
index 7c9246f..2f8ccf8 100755 (executable)
@@ -1,14 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
 
 <link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
 <link rel="stylesheet" href="/samba/style/wide.css" type="text/css" media="all" />
 <link rel="shortcut icon" href="/samba/images/favicon.ico" />
+<link rel="alternate" href="/samba/news/sambanews.xml" type="application/rss+xml" title="Samba News" />
 
 <!--[if gte IE 5.5]>
        <style type="text/css">
        /*<![CDATA[*/
        .logo_hack {
-filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
-o.png',sizingMethod='scale');
+filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/logo.png',sizingMethod='scale');
        }
        /*]]>*/ 
        </style>
@@ -28,17 +33,8 @@ o.png',sizingMethod='scale');
         </style>
 <![endif]-->
 
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-       mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value 
-       
-       if (mirrorSite != "") { 
-               document.location.href = mirrorSite 
-               } 
-   }
-// end hide -->
-</script>
+<script src="/samba/js/siteWide.js" type="text/javascript"></script>
+<script src="/samba/js/initPage.js" type="text/javascript"></script>
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Content-Language" content="en-us" />
@@ -48,7 +44,7 @@ o.png',sizingMethod='scale');
 </head>
 
 
-<body onload="document.mirrorForm.mirrorLocation.selectedIndex=0">
+<body>
 
 <div id="banner">
   <div class="stripe"></div>
@@ -60,11 +56,14 @@ o.png',sizingMethod='scale');
   <input type="submit" value="Go" />
   </form>
   <span>|</span>
-  <form action="no_script_required.cgi" name="mirrorForm">
+  <form action="no_script_yet.cgi" name="mirrorForm">
     <select name="mirrorLocation" onchange="changeMirror(this.form.mirrorLocation)">
     <option selected="selected">Choose A Mirror</option>
     <!--#include virtual="/samba/menu_options.html" --> 
     </select>
+    <noscript>
+    <input type="submit" value="Go" />
+    </noscript>
    </form>
   </div>
 </div>
@@ -83,7 +82,7 @@ o.png',sizingMethod='scale');
   <ul>
   <li><a href="/samba/what_is_samba.html">What Is Samba?</a></li>
   <li><a href="http://news.samba.org/">Latest News</a></li>
-  <li><a href="/samba/docs/FAQ/">FAQ</a></li>
+  <li><a href="/samba/docs/FAQ/">FAQ</a></li> 
   </ul>
     
   <img src="/samba/images/get.png" alt="get samba" />
@@ -99,7 +98,7 @@ o.png',sizingMethod='scale');
   <li><a href="/samba/docs/man/Samba-HOWTO-Collection/">Official HOWTO</a></li>
   <li><a href="/samba/docs/man/Samba-Guide/">By Example</a></li>
   <li><a href="/samba/docs/using_samba/toc.html">Using Samba</a></li>
-  <li><a href="/samba/docs/">Docs and Books</a></li>
+  <li><a href="/samba/docs/">Docs And Books</a></li>
   </ul>
     
   <img src="/samba/images/talk.png" alt="talk samba" />
@@ -129,7 +128,7 @@ o.png',sizingMethod='scale');
     
 </div>
 
+
 <div id="content">
   <div class="center">
 
index 52e1f15..5ff53b3 100755 (executable)
@@ -1,3 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
 
 <link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
 <link rel="stylesheet" href="/samba/style/history.css" type="text/css" media="all" />
        </style>
 <![endif]-->
 
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-        mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value
-
-        if (mirrorSite != "") {
-                document.location.href = mirrorSite
-                }
-   }
-// end hide -->
-</script>
-
+<script src="/samba/js/siteWide.js" type="text/javascript"></script>
+<script src="/samba/js/initPage.js" type="text/javascript"></script>
 
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <meta http-equiv="Content-Language" content="en-us" />
index e26ae6e..7e1e57f 100755 (executable)
@@ -1,5 +1,3 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba Release History</title>
 <!--#include virtual="header_history.html" -->
 
 <p>Previous release announcements are archived here for historical purposes.</p>
index 03966df..0c5f2ad 100755 (executable)
@@ -1,5 +1,3 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba - Security Updates and Information</title>
 <!--#include virtual="header_history.html" -->
 
 <h2>Samba Security Releases</h2>
index f59b959..61b3263 100755 (executable)
@@ -1,6 +1,4 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba - opening windows to a wider world</title>
-<!--#include virtual="/samba/header2.html" -->
 
 <div id="noswp">
 <a href="http://nosoftwarepatents.com/"><img src="/samba/images/noswp_banner.jpg" alt="No Software Patents!" /></a>
index 0174c28..cb09d24 100644 (file)
--- a/irc.html
+++ b/irc.html
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>Samba IRC Channels</title>
-<!--#include virtual="/samba/header2.html" -->
+
 
 <h2>Samba IRC Channels</h2>
 
index 56119a5..54e3912 100755 (executable)
@@ -1,6 +1,4 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Mirroring Samba</title>
-<!--#include virtual="/samba/download/header_download.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
 
 <h2>Mirroring Samba</h2>
 
index 9f91fd5..7ad151f 100755 (executable)
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>Samba - Mailing List Etiquette</title>
-<!--#include virtual="/samba/header2.html" -->
+
 
 <h2>Mailing List Etiquette</h2>
 
index c283bfd..60d9bf7 100755 (executable)
@@ -1,6 +1,4 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba - MS Liscense overview</title>
-<!--#include virtual="/samba/header2.html" -->
 
 <h2>CIFS, Microsoft and the Samba Team</h2>
 
index b50ddc4..a6dfdb1 100755 (executable)
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba - NT Systems Magazine Award</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<H2 align="center">Award from NT Systems Magazine</H2>
+<h2>Award from NT Systems Magazine</h2>
 
 We got an award and a trophy from <A
 HREF="http://www.ntsystems.com">NT Systems Magazine</A> for
index 606d011..d5506cb 100755 (executable)
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Search Samba.org</title>
-<!--#include virtual="/samba/header2.html" -->
 
-  <h2 align="center">Search</h2>
+<h2>Search</h2>
 
 <p>
 Searchable mailing list archives are available at <a
index 9ee2a0b..6486a5b 100644 (file)
@@ -1,8 +1,6 @@
-<!--#include virtual="/samba/header.html" -->
-<title>You are being redirected...</title>
-
+<html>
+<head>
 <meta http-equiv="refresh" content="0;url=/samba/history/security.html" />
-
 <head>
 <body>
 </body>
index d3ddeab..5657f6c 100755 (executable)
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" -->
 
-<h2 align=center>The smbfs filesystem</h2>
+<h2>The smbfs filesystem</h2>
 
 The smbfs filesystem is a mountable SMB filesystem for Linux. It does
 not run on any other systems.<p>
index d7314b2..4cb2899 100755 (executable)
@@ -1,6 +1,4 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba - Subversion Instructions</title>
-<!--#include virtual="/samba/download/header_download.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
 
 <h2 align="center">Subversion access to svnanon.samba.org</h2>
 
index fb2f346..4af4f31 100755 (executable)
@@ -1,3 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
 
 <link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
 <link rel="stylesheet" href="/samba/style/support.css" type="text/css" media="all" />
        </style>
 <![endif]-->
 
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-        mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value
-
-        if (mirrorSite != "") {
-                document.location.href = mirrorSite
-                }
-   }
-// end hide -->
-</script>
+<script src="/samba/js/siteWide.js" type="text/javascript"></script>
+<script src="/samba/js/initPage.js" type="text/javascript"></script>
 
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <meta http-equiv="Content-Language" content="en-us" />
index cbd6052..2ab35e5 100755 (executable)
@@ -1,5 +1,3 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba Commercial Support Providers</title>
 <!--#include virtual="header_support.html" -->
 
 There are a number of areas for you to look when searching for Samba support:
@@ -19,4 +17,4 @@ There are a number of areas for you to look when searching for Samba support:
 
 
 
-<!--#include virtual="footer_support.html"-->
\ No newline at end of file
+<!--#include virtual="footer_support.html"-->
diff --git a/team/header_team.html b/team/header_team.html
deleted file mode 100755 (executable)
index 7c9246f..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-
-<link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/samba/style/wide.css" type="text/css" media="all" />
-<link rel="shortcut icon" href="/samba/images/favicon.ico" />
-
-<!--[if gte IE 5.5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
-o.png',sizingMethod='scale');
-       }
-       /*]]>*/ 
-       </style>
-<![endif]-->
-
-<!--[if lte IE 5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-       background-image:url(/samba/images/logo.gif);
-       background-position:center;
-       background-repeat:no-repeat;
-       top:23.5px;
-       left:-10px;
-       }
-       /*]]>*/
-        </style>
-<![endif]-->
-
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-       mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value 
-       
-       if (mirrorSite != "") { 
-               document.location.href = mirrorSite 
-               } 
-   }
-// end hide -->
-</script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<meta name="keywords" content="Samba SMB CIFS" />
-<meta name="description" content="Home of Samba, the SMB file server" />
-
-</head>
-
-
-<body onload="document.mirrorForm.mirrorLocation.selectedIndex=0">
-
-<div id="banner">
-  <div class="stripe"></div>
-  
-  <div class="srch">
-  <h5>search samba.org:</h5>
-  <form method="post" action="http://de.samba.org/cgi-bin/htsearch">
-  <input type="text" size="15" name="words" value="" />
-  <input type="submit" value="Go" />
-  </form>
-  <span>|</span>
-  <form action="no_script_required.cgi" name="mirrorForm">
-    <select name="mirrorLocation" onchange="changeMirror(this.form.mirrorLocation)">
-    <option selected="selected">Choose A Mirror</option>
-    <!--#include virtual="/samba/menu_options.html" --> 
-    </select>
-   </form>
-  </div>
-</div>
-
-<div id="logo">
-  <div class="logo_hack"><a href="/samba/"><img src="/samba/images/linkpad.gif" alt="Samba" /></a></div>
-</div>
-
-<div class="slogan">
-  <h4>Opening Windows to a Wider World</h4>
-</div>
-
-<div class="nav">
-  
-  <img src="/samba/images/think.png" alt="think samba" />
-  <ul>
-  <li><a href="/samba/what_is_samba.html">What Is Samba?</a></li>
-  <li><a href="http://news.samba.org/">Latest News</a></li>
-  <li><a href="/samba/docs/FAQ/">FAQ</a></li>
-  </ul>
-    
-  <img src="/samba/images/get.png" alt="get samba" />
-  <ul>  
-  <li><a href="/samba/download/">Download Info</a></li>
-  <li><a href="/samba/ftp/Binary_Packages/">Binaries</a></li>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/install.html">How To Install</a></li>
-  <li><a href="/samba/GUI/">GUIs</a></li>
-  </ul>
-    
-  <img src="/samba/images/learn.png" alt="learn samba" />
-  <ul>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/">Official HOWTO</a></li>
-  <li><a href="/samba/docs/man/Samba-Guide/">By Example</a></li>
-  <li><a href="/samba/docs/using_samba/toc.html">Using Samba</a></li>
-  <li><a href="/samba/docs/">Docs and Books</a></li>
-  </ul>
-    
-  <img src="/samba/images/talk.png" alt="talk samba" />
-  <ul>
-  <li><a href="http://lists.samba.org">List Subscribe</a></li>
-  <li><a href="/samba/archives.html">List Archives</a></li>
-  <li><a href="/samba/irc.html">IRC</a></li>
-  <li><a href="/samba/ml-etiquette.html">Etiquette</a></li>
-  </ul>
-    
-  <img src="/samba/images/hack.png" alt="hack samba" />
-  <ul>
-  <li><a href="/samba/devel/">Devel Overview</a></li>
-  <li><a href="http://websvn.samba.org">SVN Source</a></li>
-  <li><a href="http://cvs.samba.org/cgi-bin/cvsweb/">Historical CVS Source</a></li>
-  <li><a href="http://build.samba.org/">Build Farm</a></li>
-  <li><a href="https://bugzilla.samba.org">Bug Reports</a></li>
-  </ul>
-    
-  <img src="/samba/images/contact.png" alt="contact samba" />
-  <ul>
-  <li><a href="/samba/team/">Samba Team</a></li>
-  <li><a href="/samba/donations.html">Donations</a></li>
-  <li><a href="/samba/team/tshirt.html">T-shirts, etc</a></li>
-  <li><a href="/samba/contacts.html">Contacts For...</a></li>
-  </ul>
-    
-</div>
-
-<div id="content">
-  <div class="center">
-
index 5b63a7d..0a0fab5 100755 (executable)
@@ -1,6 +1,4 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>The Samba Team</title>
-<!--#include virtual="header_team.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
 
 <h2>The Samba Team</h2>
 
index 1ef400f..8c5634d 100755 (executable)
@@ -1,8 +1,6 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba - Photo from CIFS 2002</title>
-<!--#include virtual="header_team.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
 
-<H2 align="center">The Samba Team</H2>
+<h2>The Samba Team</h2>
 
 <P>Here is a photo of some of us at the CIFS conference in 2002:
 
index 3a8b9e9..2d91d7d 100755 (executable)
@@ -1,6 +1,4 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>Samba - Photo from CIFS 1998</title>
-<!--#include virtual="header_team.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
 
 <H2 align="center">The Samba Team</H2>
 
index a1139e0..58ed501 100755 (executable)
@@ -1,6 +1,5 @@
-<!--#include virtual="/samba/header.html" --> 
-  <title>T-shirts and other Samba gear</title>
-<!--#include virtual="header_team.html" -->
+<!--#include virtual="/samba/header_wide.html" --> 
+
 
 <P>
 <CENTER>
@@ -14,7 +13,7 @@
 
 <P>
 <A NAME="shirts"> </A>
-<H1 ALIGN=CENTER>Samba T-Shirts!</H1>
+<h2>Samba T-Shirts!</h2>
 
 <CENTER>
 <TABLE BORDER=0 WIDTH=532>
index 7df9bbf..d65aa27 100755 (executable)
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" -->
-<title>Test Page</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<H1 align="center">This is a test page</H1>
+<h2>This is a test page</h2>
 
 If this page does not display correctly (with the Samba logo at the
 top) then this web server probably doesn't support server side
index ee0ee34..8bf8df1 100755 (executable)
@@ -1,8 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba Thank Yous</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<H2 align="center">Thanks</H2>
+<h2>Thanks</h2>
 
 There are a great many people and organisations that
 have contributed to the developement of Samba, and in the words
index 1644ff2..3a3295e 100755 (executable)
--- a/tng.html
+++ b/tng.html
@@ -1,8 +1,7 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>Samba/Samba-TNG Explained</title>
-<!--#include virtual="/samba/header2.html" -->
 
-<H2 align="center">Samba-TNG fork</H2>
+<h2>Samba/Samba-TNG Explained</h2>
+
 Everyone pretty much knows now that the Samba codebase has forked,
 with the TNG branch being split off into a new set of
 releases. Despite some <a
index 5b50fa0..7505e96 100644 (file)
@@ -1,9 +1,5 @@
 <!--#include virtual="/samba/header.html" --> 
-  <title>PAGE_SPECIFIC_TITLE_GOES_HERE</title>
-<!--#include virtual="/samba/header2.html" -->
-
 
 PLACE_YOUR _CONTENT_HERE
 
-
 <!--#include virtual="/samba/footer.html" -->
diff --git a/vendors/header_vendors.html b/vendors/header_vendors.html
deleted file mode 100755 (executable)
index 7c9246f..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-
-<link rel="stylesheet" href="/samba/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/samba/style/wide.css" type="text/css" media="all" />
-<link rel="shortcut icon" href="/samba/images/favicon.ico" />
-
-<!--[if gte IE 5.5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/samba/images/log
-o.png',sizingMethod='scale');
-       }
-       /*]]>*/ 
-       </style>
-<![endif]-->
-
-<!--[if lte IE 5]>
-       <style type="text/css">
-       /*<![CDATA[*/
-       .logo_hack {
-       background-image:url(/samba/images/logo.gif);
-       background-position:center;
-       background-repeat:no-repeat;
-       top:23.5px;
-       left:-10px;
-       }
-       /*]]>*/
-        </style>
-<![endif]-->
-
-<script type="text/javascript">
-<!-- Hide from old browsers
-   function changeMirror(mirrorChoice) {
-       mirrorSite = mirrorChoice.options[mirrorChoice.selectedIndex].value 
-       
-       if (mirrorSite != "") { 
-               document.location.href = mirrorSite 
-               } 
-   }
-// end hide -->
-</script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<meta name="keywords" content="Samba SMB CIFS" />
-<meta name="description" content="Home of Samba, the SMB file server" />
-
-</head>
-
-
-<body onload="document.mirrorForm.mirrorLocation.selectedIndex=0">
-
-<div id="banner">
-  <div class="stripe"></div>
-  
-  <div class="srch">
-  <h5>search samba.org:</h5>
-  <form method="post" action="http://de.samba.org/cgi-bin/htsearch">
-  <input type="text" size="15" name="words" value="" />
-  <input type="submit" value="Go" />
-  </form>
-  <span>|</span>
-  <form action="no_script_required.cgi" name="mirrorForm">
-    <select name="mirrorLocation" onchange="changeMirror(this.form.mirrorLocation)">
-    <option selected="selected">Choose A Mirror</option>
-    <!--#include virtual="/samba/menu_options.html" --> 
-    </select>
-   </form>
-  </div>
-</div>
-
-<div id="logo">
-  <div class="logo_hack"><a href="/samba/"><img src="/samba/images/linkpad.gif" alt="Samba" /></a></div>
-</div>
-
-<div class="slogan">
-  <h4>Opening Windows to a Wider World</h4>
-</div>
-
-<div class="nav">
-  
-  <img src="/samba/images/think.png" alt="think samba" />
-  <ul>
-  <li><a href="/samba/what_is_samba.html">What Is Samba?</a></li>
-  <li><a href="http://news.samba.org/">Latest News</a></li>
-  <li><a href="/samba/docs/FAQ/">FAQ</a></li>
-  </ul>
-    
-  <img src="/samba/images/get.png" alt="get samba" />
-  <ul>  
-  <li><a href="/samba/download/">Download Info</a></li>
-  <li><a href="/samba/ftp/Binary_Packages/">Binaries</a></li>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/install.html">How To Install</a></li>
-  <li><a href="/samba/GUI/">GUIs</a></li>
-  </ul>
-    
-  <img src="/samba/images/learn.png" alt="learn samba" />
-  <ul>
-  <li><a href="/samba/docs/man/Samba-HOWTO-Collection/">Official HOWTO</a></li>
-  <li><a href="/samba/docs/man/Samba-Guide/">By Example</a></li>
-  <li><a href="/samba/docs/using_samba/toc.html">Using Samba</a></li>
-  <li><a href="/samba/docs/">Docs and Books</a></li>
-  </ul>
-    
-  <img src="/samba/images/talk.png" alt="talk samba" />
-  <ul>
-  <li><a href="http://lists.samba.org">List Subscribe</a></li>
-  <li><a href="/samba/archives.html">List Archives</a></li>
-  <li><a href="/samba/irc.html">IRC</a></li>
-  <li><a href="/samba/ml-etiquette.html">Etiquette</a></li>
-  </ul>
-    
-  <img src="/samba/images/hack.png" alt="hack samba" />
-  <ul>
-  <li><a href="/samba/devel/">Devel Overview</a></li>
-  <li><a href="http://websvn.samba.org">SVN Source</a></li>
-  <li><a href="http://cvs.samba.org/cgi-bin/cvsweb/">Historical CVS Source</a></li>
-  <li><a href="http://build.samba.org/">Build Farm</a></li>
-  <li><a href="https://bugzilla.samba.org">Bug Reports</a></li>
-  </ul>
-    
-  <img src="/samba/images/contact.png" alt="contact samba" />
-  <ul>
-  <li><a href="/samba/team/">Samba Team</a></li>
-  <li><a href="/samba/donations.html">Donations</a></li>
-  <li><a href="/samba/team/tshirt.html">T-shirts, etc</a></li>
-  <li><a href="/samba/contacts.html">Contacts For...</a></li>
-  </ul>
-    
-</div>
-
-<div id="content">
-  <div class="center">
-
index cd14eb7..4f8fcad 100755 (executable)
@@ -1,8 +1,6 @@
-<!--#include virtual="/samba/header.html" -->
-  <title>Samba-based Commercial Products</title>
-<!--#include virtual="header_vendors.html" -->
+<!--#include virtual="/samba/header_wide.html" -->
 
-<H2 align="center">Samba Vendors</H2>
+<h2>Samba Vendors</h2>
 
 <P>Quite a few vendors use Samba as part of a larger product. This gives
 them a top-quality SMB server with the flexibility to modify the server to
index 046aa85..6068fbb 100755 (executable)
@@ -1,6 +1,6 @@
 <!--#include virtual="/samba/header.html" --> 
   <title>What is Samba?</title>
-<!--#include virtual="/samba/header2.html" -->
+
 
 <h2>What is Samba?</h2>