Another attempt at simplifying headers, while still

author Deryck Hodge <deryck@samba.org>

Wed, 11 May 2005 23:27:13 +0000 (23:27 +0000)

committer Deryck Hodge <deryck@samba.org>

Wed, 11 May 2005 23:27:13 +0000 (23:27 +0000)
author Deryck Hodge <deryck@samba.org>
Wed, 11 May 2005 23:27:13 +0000 (23:27 +0000)
committer Deryck Hodge <deryck@samba.org>
Wed, 11 May 2005 23:27:13 +0000 (23:27 +0000)
diff --git a/GUI/header_gui.html b/GUI/header_gui.html

deleted file mode 100644 (file)

index 7c9246f..0000000
--- a/GUI/header_gui.html
+++ /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">
-
diff --git a/GUI/index.html b/GUI/index.html

index 873453e6eb1056ae44b2bc5f423848b3a704d4f3..b5e28384ea5d41349424aee8582bb90fab3471c6 100755 (executable)
--- a/GUI/index.html
+++ b/GUI/index.html
@@ -1,6 +1,6 @@
  <!--#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>
  
diff --git a/archive-policy.html b/archive-policy.html

index 5df01e52330990e08ac803ea1b3eb7c9c4d24fe9..7e87adb275cf7a6b741a93f3abe1378f547fb32c 100644 (file)
--- a/archive-policy.html
+++ b/archive-policy.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba - Policy for Archiving Mailing Lists</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <h2 align="center">Samba list archive editing policy</h2>
  
diff --git a/archives.html b/archives.html

index 3c661ee09b753c521e040b9edb4992210a4777eb..d683ad3002764e253c3571af5a7ca2d5c6c240b1 100755 (executable)
--- a/archives.html
+++ b/archives.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba - Mailing List Archives</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <h2>Samba Mailing Lists</h2>
  
diff --git a/books.html b/books.html

index 0a0b5fdf274d94821a34219e5b9d57b59a4022d9..2167d01bdc389817c15261068e37192a47b7c42b 100755 (executable)
--- a/books.html
+++ b/books.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Books on Samba, by year</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <H2 align="center">Samba books</H2>
  
diff --git a/buglist.html b/buglist.html

index ca260102b3d8d238d3e1964c58bce19bfeb5b758..4f52517d33483d67d7d846d5bca512c87abba06d 100755 (executable)
--- a/buglist.html
+++ b/buglist.html
@@ -1,5 +1,6 @@
  <!--#include virtual="/samba/header.html" -->
-
+  <title>Recent Bugs List</title>
+<!--#include virtual="/samba/header_columns.html" -->
  
  <h2 align="center">Recent bugs list</h2>
  
diff --git a/bugreports.html b/bugreports.html

index 971577eb5999013e4159258a1ffb0ca2dc94dca4..101587ec44440e424bf6a11daddb59fde0b2a6ed 100755 (executable)
--- a/bugreports.html
+++ b/bugreports.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba Bug Report HOWTO</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <H2 align="center">Bug Reports, Patches  &amp; contacting the Samba Team</H2>
  
diff --git a/colophon.html b/colophon.html

index 5944e5709a7adfffc3f7b0c00d28744732a0ef40..62544af0859d86bdf6212b4468533a4375855fb4 100755 (executable)
--- a/colophon.html
+++ b/colophon.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" -->
  <title>samba.org, version 3</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
      <h2>A Redesigned samba.org</h2>
      
diff --git a/contacts.html b/contacts.html

index 75e809fcd98d98b9729a2b1cee994cb22b12eb09..c1d072f7a7f63e18ae783332d9627cd126059674 100755 (executable)
--- a/contacts.html
+++ b/contacts.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba Contacts</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <h2>Contacts for...</h2>
  
diff --git a/courses.html b/courses.html

index f6419916eb6f3afa5462f3c4ddf39d19d104d525..9445988a9f16f20a7ebec2b308a1e3d55ecd3db1 100755 (executable)
--- a/courses.html
+++ b/courses.html
@@ -1,6 +1,8 @@
  <!--#include virtual="/samba/header.html" -->
+  <title>Samba Course</title>
+<!--#include virtual="/samba/header_columns.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>.
diff --git a/cvs.html b/cvs.html

index 2dd50d135e9c22014354cb9120fb4e46e3b99763..d100c9b9dfcd89668cfc7bcd1ef7ea05d05c8a5c 100755 (executable)
--- a/cvs.html
+++ b/cvs.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba - CVS Instructions</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  
  <h2 align="center">CVS Access to pserver.samba.org</h2>
diff --git a/devel/TODO.html b/devel/TODO.html

index 86be5297d495cd3880580ca4b63aab07bee70b21..bcdfb1538ea35d6c98b75439133b2d77e27debfc 100755 (executable)
--- a/devel/TODO.html
+++ b/devel/TODO.html
@@ -1,8 +1,8 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba Development TODO List</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.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/devel_template b/devel/devel_template

index 20de9f0c7613dd5425c7867f98c39d5759f56f15..1501ed064bd98492d476403ccf31f2211889336e 100644 (file)
--- a/devel/devel_template
+++ b/devel/devel_template
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" -->
    <title>PAGE_SPECIFIC_TITLE_GOES_HERE</title>
-<!--#include virtual="header_devel.html" -->
+<!--#include virtual="/samba/header_wide.html" -->
  
  
  PLACE_YOUR_CONTENT_HERE
diff --git a/devel/header_devel.html b/devel/header_devel.html

deleted file mode 100644 (file)

index 3fc5167..0000000
--- a/devel/header_devel.html
+++ /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">
-
diff --git a/devel/index.html b/devel/index.html

index 089fc6d889b633248c4e14993c002a93694b6c62..1e43dab518c08f3502b72d2cd615a63aeff5fcce 100644 (file)
--- a/devel/index.html
+++ b/devel/index.html
@@ -1,6 +1,7 @@
  <!--#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>
diff --git a/devel/roadmap-3.html b/devel/roadmap-3.html

index 6cd92df4a4df3f69d12de8b254630dc82c28c703..9add9473e8831a50ce1279ccf5a34f38a032a82f 100755 (executable)
--- a/devel/roadmap-3.html
+++ b/devel/roadmap-3.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba 3.0 Roadmap</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <h3>Current development branches</h3>
  
diff --git a/devel/roadmap-4.0.html b/devel/roadmap-4.0.html

index 076390ab51949c015e6c4b613e5838f1c5e66962..b80fad269171e3b6af8c63b04a1d1130a4db678a 100644 (file)
--- a/devel/roadmap-4.0.html
+++ b/devel/roadmap-4.0.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba 4.0 Roadmap</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <h2 align="center">Roadmap to Samba 4.0.0</h2>         
  
diff --git a/docs/10years.html b/docs/10years.html

index ac890a415ba155bb0529bbfe866372764e53bfbf..6304cc7ab7825eccdf9ff1bd2a5f3454ef018bce 100755 (executable)
--- a/docs/10years.html
+++ b/docs/10years.html
@@ -1,6 +1,8 @@
  <!--#include virtual="/samba/header.html" -->
+  <title>10 years of Samba!</title>
+<!--#include virtual="/samba/header_wide.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
diff --git a/docs/FAQ/index.html b/docs/FAQ/index.html

index b8cd1dea7bb4d129158bf5acf32944a5017c59b8..bfeefe4ad60b08cbef71157bd8f722e49d173a9a 100755 (executable)
--- a/docs/FAQ/index.html
+++ b/docs/FAQ/index.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba FAQ </title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  
  <h2>Frequently Asked Questions</h2>
diff --git a/docs/GPL.html b/docs/GPL.html

index 6cff72234812130a9b0348396951ec257d6c52ab..062204bd5eacc50564af551c7de01a67bff5cc93 100755 (executable)
--- a/docs/GPL.html
+++ b/docs/GPL.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" -->
-<title>GPL on Samba.org</title>
-<!--#include virtual="/samba/header2.html" -->
+  <title>GPL on Samba.org</title>
+<!--#include virtual="/samba/header_wide.html" -->
  
  <pre>
  <!--#include virtual="/samba/ftp/COPYING" -->
diff --git a/docs/anecdotes.html b/docs/anecdotes.html

index 9f1bc95639200a7c3b08f8b3ac27717729a87567..62fedd1dd828c824073a544c8476797caf8ee28e 100755 (executable)
--- a/docs/anecdotes.html
+++ b/docs/anecdotes.html
@@ -1,6 +1,8 @@
  <!--#include virtual="/samba/header.html" -->
+  <title>Samba Anecdotes!</title>
+<!--#include virtual="/samba/header_wide.html" -->
  
-<H2 ALIGN="CENTER">Samba Anecdotes!</H2>
+<h2>Samba Anecdotes!</h2>
  
  <H3 ALIGN=CENTER>...regarding the Linux Penguin mascot</H3>
  
diff --git a/docs/docs_template b/docs/docs_template

index f4d99bf47b5f4d717e365f916c6712bcd68ae3ac..91d5517db0a6e14b3956340796d699fe4a085cf5 100644 (file)
--- a/docs/docs_template
+++ b/docs/docs_template
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" -->
    <title>PAGE_SPECIFIC_TITLE</title>
-<!--#include virtual="header_docs.html" -->
+<!--#include virtual="header_wide.html" -->
  
  
  PLACE_YOUR_CONTENT_HERE
diff --git a/docs/header_docs.html b/docs/header_docs.html

deleted file mode 100644 (file)

index 7c9246f..0000000
--- a/docs/header_docs.html
+++ /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">
-
diff --git a/docs/index.html b/docs/index.html

index 36af317bd192da8249c875aa987446a4eba22bef..59f1d4db20c7754cd36cbc90a0f387cd3db93712 100755 (executable)
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba Documentation</title>
-<!--#include virtual="header_docs.html" -->
+<!--#include virtual="/samba/header_wide.html" -->
  
  <!-- $Revision: 1.76 $ -->
  
diff --git a/docs/myths_about_samba.html b/docs/myths_about_samba.html

index 98a3d32d5d098ba3cc213fb72f23dd830410ce10..af72a549845a40db46d705ac89915de9cdf546c7 100755 (executable)
--- a/docs/myths_about_samba.html
+++ b/docs/myths_about_samba.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" -->
    <title>Myths About Samba</title>
-<!--#include virtual="header_docs.html" -->
+<!--#include virtual="/samba/header_wide.html" -->
  
      <h3><b>Myths About Samba</b></h3>
  
diff --git a/docs/server_security.html b/docs/server_security.html

index 3b8cd1a7cc60f6e465ca1b13568ad9b06b598a96..2c83f610374eaae9e8db93f09a9fdd4c8ee47a05 100755 (executable)
--- a/docs/server_security.html
+++ b/docs/server_security.html
@@ -1,6 +1,6 @@
  <!--#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>
  
diff --git a/docs/swat_ssl.html b/docs/swat_ssl.html

index af929131c4b28df1acc59331b523865db74fed1a..29e7bec78b23110c831cf2cbec7fd7ff5221e27e 100755 (executable)
--- a/docs/swat_ssl.html
+++ b/docs/swat_ssl.html
@@ -1,6 +1,8 @@
  <!--#include virtual="/samba/header.html" -->
+  <title>SWAT and SSL</title>
+<!--#include virtual="/samba/header_wide.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
diff --git a/donations.html b/donations.html

index e1bf5aa9b0656dbd6d84376e77f3024d2dcd48a5..b34605ed5e33836021b90baf383c6d72eb9b7431 100755 (executable)
--- a/donations.html
+++ b/donations.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Donations to Help Support Samba</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <h2>samba.org donations</h2>
  
diff --git a/download/download_template b/download/download_template

index 3c549d55717bca35b8036bc90f446947f5f0d862..cd80376de3aff8ff9fccda2c455de8fc2e13eb24 100644 (file)
--- a/download/download_template
+++ b/download/download_template
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" -->
    <title>PAGE_SPECIFIC_TITLE_HERE</title>
-<!--#include virtual="header_download.html" -->
+<!--#include virtual="/samba/header_wide.html" -->
  
  
  PLACE_YOUR_CONTENT_HERE
diff --git a/download/ftp_mirrors.html b/download/ftp_mirrors.html

index 45e50c854d85c93e89e3d088c0926c7b2224ed79..533a7b754c113fcaad273d570d7bc3804a3dad27 100755 (executable)
--- a/download/ftp_mirrors.html
+++ b/download/ftp_mirrors.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba Download Sites</title>
-<!--#include virtual="header_download.html" -->
+<!--#include virtual="/samba/header_wide.html" -->
  
  <h2>ftp Mirror Sites</h2>
  
diff --git a/download/header_download.html b/download/header_download.html

deleted file mode 100644 (file)

index bfdcc21..0000000
--- a/download/header_download.html
+++ /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">
-
diff --git a/download/index.html b/download/index.html

index f9a978c73278c27b40c7b1cbf7435f940779f2f1..240541d7905e4a90980aa55311222cc54c9c78b4 100755 (executable)
--- a/download/index.html
+++ b/download/index.html
@@ -1,6 +1,6 @@
  <!--#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
diff --git a/header2.html b/header_columns.html

similarity index 100%

rename from header2.html

rename to header_columns.html
diff --git a/header_wide.html b/header_wide.html

index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..85a48a0b36db58cfa981b9fd109747bdac4dd3a1 100755 (executable)
--- a/header_wide.html
+++ b/header_wide.html
@@ -0,0 +1,134 @@
+<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">
+
diff --git a/index.html b/index.html

index f59b959df491b71e0271a92514f4fe3365ad63e6..46c60c9fb64dd008793cebbf8b09bfba51f6e14b 100755 (executable)
--- a/index.html
+++ b/index.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba - opening windows to a wider world</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <div id="noswp">
  <a href="http://nosoftwarepatents.com/"><img src="/samba/images/noswp_banner.jpg" alt="No Software Patents!" /></a>
diff --git a/irc.html b/irc.html

index 0174c2867016617dc3c01edb4b6cbd17f7bd1873..4e8c63c28efbedb955b26d44aa4ee0b33c98d9a5 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" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <h2>Samba IRC Channels</h2>
  
diff --git a/ml-etiquette.html b/ml-etiquette.html

index 9f91fd508491d0fa4b880b3cda18cf3bd1bd7fa5..63096efff61825730322f747f6df25ea98f548af 100755 (executable)
--- a/ml-etiquette.html
+++ b/ml-etiquette.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba - Mailing List Etiquette</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <h2>Mailing List Etiquette</h2>
  
diff --git a/ms_license.html b/ms_license.html

index c283bfde0588dee7967c1861c026856c1ce8d5f7..ffe0fc20bf18cc6e5707a00857228cd915d8f071 100755 (executable)
--- a/ms_license.html
+++ b/ms_license.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba - MS Liscense overview</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <h2>CIFS, Microsoft and the Samba Team</h2>
  
diff --git a/ntsystems.html b/ntsystems.html

index b50ddc44cf28a1822aa6ca5562b85b3e6a4c1494..9f67baaa1e54e88aaf161967c51b1eaa877c9967 100755 (executable)
--- a/ntsystems.html
+++ b/ntsystems.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba - NT Systems Magazine Award</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <H2 align="center">Award from NT Systems Magazine</H2>
  
diff --git a/search.html b/search.html

index 606d01109936f9513990c5c7be598e2b91a5c504..2f711365b67733e286e187136bab02401289b2e2 100755 (executable)
--- a/search.html
+++ b/search.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Search Samba.org</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
    <h2 align="center">Search</h2>
  
diff --git a/team/header_team.html b/team/header_team.html

deleted file mode 100644 (file)

index 7c9246f..0000000
--- a/team/header_team.html
+++ /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">
-
diff --git a/team/index.html b/team/index.html

index 5b63a7dbb342cece1a4d2cfc64660ba1674d2c4d..70e086cdd3cc65d80a00d434f7f39d264a0007c6 100755 (executable)
--- a/team/index.html
+++ b/team/index.html
@@ -1,6 +1,6 @@
  <!--#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>
  
diff --git a/team/team2002.html b/team/team2002.html

index 1ef400fbcfcdd5f6d1c250a0dc1ae3b372955fce..69a5f8d7b7b14d91ddcf8876fdce88f864fa921d 100755 (executable)
--- a/team/team2002.html
+++ b/team/team2002.html
@@ -1,8 +1,8 @@
  <!--#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:
  
diff --git a/team/team98.html b/team/team98.html

index 3a8b9e9d9a5673e8e72265c5e3f37869a32d4b6d..110a7e6d71084c63d174d807ce42fe63a8b6ed0e 100755 (executable)
--- a/team/team98.html
+++ b/team/team98.html
@@ -1,6 +1,6 @@
  <!--#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>
  
diff --git a/team/team_template b/team/team_template

index 4fb6b317862093ae45b322c20caaf3b8f1a860d6..a77b0329e782cd3a22dfc2a076927146379f2328 100644 (file)
--- a/team/team_template
+++ b/team/team_template
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" -->
    <title>The Samba Team</title>
-<!--#include virtual="header_team.html" -->
+<!--#include virtual="/samba/header_wide.html" -->
  
  PLACE_YOUR_CONTENT_HERE
  
diff --git a/team/tshirt.html b/team/tshirt.html

index a1139e0e97dd97923802dccd3bdaac257505ee51..4aa4e9e6e53093ca125e06fb36b51ecb9f7c7f08 100755 (executable)
--- a/team/tshirt.html
+++ b/team/tshirt.html
@@ -1,6 +1,6 @@
  <!--#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>
diff --git a/testpage.html b/testpage.html

index 7df9bbf27d4bc1b56d738003ae853becc9513b61..14570da332afb157c481b9819eff7a0b585c2177 100755 (executable)
--- a/testpage.html
+++ b/testpage.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" -->
  <title>Test Page</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <H1 align="center">This is a test page</H1>
  
diff --git a/thanks.html b/thanks.html

index ee0ee343d0671deb145ac3e979bf921aecd67e50..07eb06bcb805834fd9ee21de7007de7e70fbb5a4 100755 (executable)
--- a/thanks.html
+++ b/thanks.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba Thank Yous</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <H2 align="center">Thanks</H2>
  
diff --git a/tng.html b/tng.html

index 1644ff22d73019cb23fb151ffa192b383a628307..354b174c549b28777269dff618f843465c9b419e 100755 (executable)
--- a/tng.html
+++ b/tng.html
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>Samba/Samba-TNG Explained</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  <H2 align="center">Samba-TNG fork</H2>
  Everyone pretty much knows now that the Samba codebase has forked,
diff --git a/top_level_template b/top_level_template

index 5b50fa0309d7c6e56987e701cdcb7bc1bc1e3f2a..4b5efcdd811229e49a106d25e236df30411f658b 100644 (file)
--- a/top_level_template
+++ b/top_level_template
@@ -1,6 +1,6 @@
  <!--#include virtual="/samba/header.html" --> 
    <title>PAGE_SPECIFIC_TITLE_GOES_HERE</title>
-<!--#include virtual="/samba/header2.html" -->
+<!--#include virtual="/samba/header_columns.html" -->
  
  
  PLACE_YOUR _CONTENT_HERE
diff --git a/vendors/header_vendors.html b/vendors/header_vendors.html

deleted file mode 100644 (file)

index 7c9246f..0000000
--- a/vendors/header_vendors.html
+++ /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">
-
diff --git a/vendors/index.html b/vendors/index.html

index cd14eb78ea753eab35814e879550e60fc1aeaaeb..db48e6257f403e1b7def36ec0fbf0085882f7730 100755 (executable)
--- a/vendors/index.html
+++ b/vendors/index.html
@@ -1,6 +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>
author	Deryck Hodge <deryck@samba.org>
	Wed, 11 May 2005 23:27:13 +0000 (23:27 +0000)
committer	Deryck Hodge <deryck@samba.org>
	Wed, 11 May 2005 23:27:13 +0000 (23:27 +0000)
GUI/header_gui.html	[deleted file]	patch \| blob \| history
GUI/index.html		patch \| blob \| history
archive-policy.html		patch \| blob \| history
archives.html		patch \| blob \| history
books.html		patch \| blob \| history
buglist.html		patch \| blob \| history
bugreports.html		patch \| blob \| history
colophon.html		patch \| blob \| history
contacts.html		patch \| blob \| history
courses.html		patch \| blob \| history
cvs.html		patch \| blob \| history
devel/TODO.html		patch \| blob \| history
devel/devel_template		patch \| blob \| history
devel/header_devel.html	[deleted file]	patch \| blob \| history
devel/index.html		patch \| blob \| history
devel/roadmap-3.html		patch \| blob \| history
devel/roadmap-4.0.html		patch \| blob \| history
docs/10years.html		patch \| blob \| history
docs/FAQ/index.html		patch \| blob \| history
docs/GPL.html		patch \| blob \| history
docs/anecdotes.html		patch \| blob \| history
docs/docs_template		patch \| blob \| history
docs/header_docs.html	[deleted file]	patch \| blob \| history
docs/index.html		patch \| blob \| history
docs/myths_about_samba.html		patch \| blob \| history
docs/server_security.html		patch \| blob \| history
docs/swat_ssl.html		patch \| blob \| history
donations.html		patch \| blob \| history
download/download_template		patch \| blob \| history
download/ftp_mirrors.html		patch \| blob \| history
download/header_download.html	[deleted file]	patch \| blob \| history
download/index.html		patch \| blob \| history
header_columns.html	[moved from header2.html with 100% similarity]	patch \| blob \| history
header_wide.html		patch \| blob \| history
index.html		patch \| blob \| history
irc.html		patch \| blob \| history
ml-etiquette.html		patch \| blob \| history
ms_license.html		patch \| blob \| history
ntsystems.html		patch \| blob \| history
search.html		patch \| blob \| history
team/header_team.html	[deleted file]	patch \| blob \| history
team/index.html		patch \| blob \| history
team/team2002.html		patch \| blob \| history
team/team98.html		patch \| blob \| history
team/team_template		patch \| blob \| history
team/tshirt.html		patch \| blob \| history
testpage.html		patch \| blob \| history
thanks.html		patch \| blob \| history
tng.html		patch \| blob \| history
top_level_template		patch \| blob \| history
vendors/header_vendors.html	[deleted file]	patch \| blob \| history
vendors/index.html		patch \| blob \| history